Isaac Connor
9e2a4335d1
Even objects can have cached properties, so add an undef in calls to Storage and Path so that they get recalculated. This should fix invalid errors about Event already being moved, when in fact it hasn't.
2024-01-05 10:43:33 -05:00
Isaac Connor
6f40293e93
Fix incorrect use of zmDbExecute causing emails to not be sent. Fixes #3800
2024-01-04 10:16:38 -05:00
Isaac Connor
9024e5a479
Include backtrace info when logging sql error
2024-01-04 10:16:07 -05:00
Isaac Connor
42a284d9ac
Add quotes around dbUser and dbPass to prevent command injection
2024-01-02 14:00:34 -05:00
Isaac Connor
b39445d5c5
Add quotes around dbUser to prevent command injection
2024-01-02 13:59:17 -05:00
Isaac Connor
112eb6b9ad
Add support for EISNAP and EPISNAP for snapshot image
2023-12-19 12:27:02 -05:00
Isaac Connor
d1c52987bd
Add returning both the sth and res
2023-12-19 12:16:36 -05:00
Isaac Connor
4eaf274c67
Use new zmDbExecute helper function, when there are no alarm frames, still do the substitutions so that we don't leave the tags. EIMOD and EIMODG don't depend on frames, so move them out.
2023-12-19 12:16:19 -05:00
Isaac Connor
29b16a5384
Implement zmDbExecute which is slightly more useful than zmSQLExecute
2023-12-19 10:54:22 -05:00
Isaac Connor
66e1f968c0
Add a warning when a filter takes longere than it's execution period
2023-12-18 11:40:20 -05:00
Isaac Connor
591e900fcf
Remove debug
2023-12-18 11:39:52 -05:00
Isaac Connor
b618030b7a
Increase time between TERM and KILL because ffmpeg connect can take way more than 10 secs
2023-12-14 09:29:03 -05:00
Isaac Connor
803cc8bc1a
Add zmDbSupportsFeature with skip_locked support
2023-12-05 09:42:01 -05:00
Isaac Connor
6bf0533341
Better logging, only commit if no error.
2023-12-04 14:17:18 -05:00
Isaac Connor
983ccb7afc
Add support for double in zmMemWrite
2023-12-03 10:37:53 -05:00
Isaac Connor
4ff215e8bd
Fix for when system_utilisation is empty
2023-11-30 14:38:41 -05:00
Isaac Connor
3627a4e97d
Add ZM_WEB_VIEWING_TIMEOUT config setting for each bw profile.
2023-11-20 13:25:26 -05:00
Isaac Connor
d62779b1e8
Include command that failed in Error.
2023-11-16 13:06:52 -05:00
Isaac Connor
939db57fa9
When command fails, log at Warning instead of Debug.
2023-11-16 13:06:29 -05:00
Isaac Connor
b6bd1c93ad
Sort output of status by pid.
2023-10-31 09:59:02 -04:00
Isaac Connor
818eb5e0a3
Add a db ping to handle reconnection when zmupdate is running as a daemon. Move code around to be more efficient.
2023-10-27 11:08:22 -04:00
Isaac Connor
7596cdcde3
Change grep to match at beginning of line. The grep can show in the process list and so give us a broken result. Add debugging when we don't get a value.
2023-10-23 17:05:15 -04:00
Isaac Connor
eb6baf4365
Importance is an enum, default value should be Normal
2023-10-23 12:51:29 -04:00
Isaac Connor
eb291b76d1
Better log message when we have a weird value for Importance
2023-10-23 12:49:12 -04:00
Isaac Connor
651fe2596f
Remove debug, add ETAGS subsitution. Fix not doing substitutions on the head of a summary email
2023-10-04 17:08:13 -04:00
Isaac Connor
582245cdaf
Rework new and find to properly handle multi-column primary keys
2023-10-04 17:07:50 -04:00
Isaac Connor
69e6c56ac3
Add Objects for Tag, Event_Tag and add functions to Event to load them.
2023-10-04 17:07:19 -04:00
Isaac Connor
3836e7d2a7
The value will be the Tag ID so compare against T.Id not T.Name
2023-10-04 15:57:54 -04:00
Isaac Connor
fc2198d375
Update Path after changing Storage Area
2023-10-04 10:07:07 -04:00
Isaac Connor
86e1959378
Use new ZM_PATH_UNAME instead of uname on PATH
2023-09-28 12:59:39 -04:00
Isaac Connor
87d29f10c6
Use new ZM_PATH_UNAME instead of uname on PATH
2023-09-28 12:59:28 -04:00
Isaac Connor
243edcc82f
Use new ZM_PATH_RM instead of hard coding path to rm
2023-09-28 12:59:08 -04:00
Isaac Connor
2a7b8a1dbb
Use https proxy instead of http since we now access an https url
2023-09-23 12:28:18 -04:00
Isaac Connor
e739b04a97
Add more debugging and event deleting when renumbering
2023-09-22 16:28:35 -04:00
Isaac Connor
92d3e00db1
Add GROUP BY E.Id to fix mysql complaining about teh aggregate function
2023-09-20 13:35:51 -04:00
Isaac Connor
25dfbf27f6
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-09-18 17:05:56 -04:00
Isaac Connor
eea18b1663
Implement event renumbering in zmeventtool
2023-09-18 17:05:32 -04:00
Isaac Connor
82a7dca63b
SELECTING auto_increment value doesn't work. Must use mysql_insertid
2023-09-18 17:05:10 -04:00
Isaac Connor
b22ef6f328
Use a subselect instead of join because newer mysql doesn't like the aggregate functions without telling it how to group the other columns
2023-09-18 09:59:46 -04:00
Isaac Connor
f8c89a0405
Merge branch 'master' into tags
2023-09-14 16:42:06 -04:00
Isaac Connor
bf34db7da2
Log a warning when failed to send an email
2023-09-09 12:04:57 -04:00
Simpler1
18d74ed7ac
(feat): Tags
...
fix(tag): Create tags on mobile
chore(tags): Change TagName to Name
chore(tags): eslint
chore(tags): dbFetchAll to dbQuery for removetag
chore(events): eslint (attempt 2)
feat(tags): Better handling of keyboard
fix(tags): Enter key for creating new tag
fix(tags): Don't allow space as a tag name
feat(tags): Delete tag if last assignment removed
fix(tags): Increase height of dropdown
in progress
fix(Tags): Use T.Id on the events page dropdown
fix(Tags): Remove $availableTags from events.php
chore(sql): Formatting sql statements
feat(Tags): Working OR on filters and events pages
fix(filter): Populate availableTags
chore(Tags): code formatting
fix(tag): Add tag on create tag
Fix(tags): Remove tag from available if last
feat(tags): Add zm_update.sql
fix(chosen): Undo css width
fix(chosen): tags dropdown width
fix(tags): dropdown over timeline
fix(tags): Full width input
fix(events): Refresh table on page show
chore(filter): Clean up availableTags
chore(event): Clean up available & selected Tags
fix(event): Update available tags on remove
fix(event): Remove hack for selected tags
feat(tags): Blur input after adding tag
doc(tags): Initial tags documentation
fix(tags): Dark theme dropdown
fix(tags): Dark theme for tags on input
fix(tags): Dark theme for highlight in dropdown
fix(tags): Populate filter tags droplist
chore(): Bump zm_update to 1.37.42
chore(tags): Move mobile check to skin.js
chore(tags): Comment debug statements
fix(tags): Enter key to create tag on mobile Chome
chore(tags): Space in 'All Tags' for translation
Temporary commit to handle cookie expiration times
chore(tags): Remove unnecessary Tag(s) from en_gb
chore(): Cleanup unnecessary Error and Debug
chore(): Resolve merge conflicts
chore(): Address merge conflicts with master
2023-08-31 15:50:08 -04:00
Alejandro Criado-Pérez
6fd119157a
Text corrections
2023-08-27 02:00:59 +02:00
Isaac Connor
61d0cec1fa
Debug the result of the auth header split, not the same line over and over
2023-08-18 16:56:37 -04:00
Isaac Connor
e163509d57
auto_reconnect id deprecated.
2023-08-16 09:53:07 -04:00
Isaac Connor
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
Isaac Connor
769f6ce372
Only set channel from the default (1) if ControlDevice is populated
2023-08-08 13:28:18 -04:00
Isaac Connor
206be0ea96
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-08-02 13:36:33 -04:00
Isaac Connor
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
Isaac Connor
f1b3bc08c1
Use opendir instead of glob when copying files. For performance reasons.
2023-08-02 13:27:45 -04:00
Isaac Connor
54000bc204
Reduce redundant debugging
2023-08-02 13:05:57 -04:00
Jonathan Bennett
5c9588c012
Adds RTSP2Web support for live view
2023-07-29 23:46:31 -05:00
Isaac Connor
bd71b35403
Handle RateControl being undef
2023-07-27 11:47:02 -04:00
Isaac Connor
b3fb68b293
Fix test for undef
2023-07-25 13:24:57 -04:00
Isaac Connor
30c8052e60
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-07-25 12:32:40 -04:00
Isaac Connor
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
sletteland
8c754fb97d
Merge branch 'ZoneMinder:master' into onvif_events
2023-07-24 13:53:07 +02:00
Isaac Connor
40516598fa
Fix errant `
2023-07-12 17:45:33 -04:00
Isaac Connor
3e3d628fa1
Sync up missing fields in Monitor class. Add code for Manufacturer and Model
2023-07-11 17:27:08 -04:00
Isaac Connor
efb27298c1
Rough in classes for Manufacturer and Model
2023-07-11 17:26:49 -04:00
Isaac Connor
93031e86d8
Add latitude and longitude to shmem
2023-07-09 12:03:51 -04:00
Alejandro Criado-Pérez
871bf1772f
fix: messages
2023-07-05 01:03:48 +02:00
root
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
Isaac Connor
2aa5de8d51
Sync up with zm_utils version
2023-06-10 12:19:52 -04:00
Isaac Connor
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
Isaac Connor
6148b805f6
Don't update non-existent Server entry
2023-06-04 09:43:32 -04:00
Isaac Connor
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
Isaac Connor
1f9559922c
Don't watch deleted monitors
2023-05-31 12:17:49 -04:00
Isaac Connor
2f827a5178
Fix EPATH substitution
2023-05-30 12:01:14 -04:00
Isaac Connor
e51ddc2492
Don't require loading the monitor object for MonitorId
2023-05-29 20:43:49 -04:00
Isaac Connor
e8cd673569
Add MID and EID substitutions
2023-05-29 16:23:15 -04:00
Isaac Connor
3c0bb3a7a0
Clean up realm usage, add some more debugging
2023-05-25 13:54:24 -04:00
Isaac Connor
6b415f5d55
Remove redundant request in PutCmd
2023-05-24 14:42:13 -04:00
Isaac Connor
c0e66644e9
Update Netcat to support Digest Auth, and fix bad cutnpaste
2023-05-17 19:12:36 -04:00
Isaac Connor
e0d0d17f5e
Fix not attaching body when not doing an html body. Fixes #3708
2023-05-16 09:56:01 -04:00
Isaac Connor
447e411aa7
Add getting username/password/address from Path instead of ContrnolAddress
2023-05-14 19:28:40 -04:00
Simpler1
06aff72292
feat(sound): Include default alarm sound (again)
2023-05-12 16:45:13 -04:00
Isaac Connor
becabbcd1a
Make objdetect attachments have unique filename
2023-04-26 14:54:02 -04:00
Isaac Connor
d81a8a9c9c
Add Deleted to Monitor perl object
2023-04-25 13:51:53 -04:00
Isaac Connor
1d7fe3f8ff
objdetect images not existing should not be a warning
2023-04-25 09:59:40 -04:00
Isaac Connor
3fbf16cf74
Only send summary email if there are events
2023-04-24 20:15:11 -04:00
Isaac Connor
d2fb365fa9
Add the ability to send a single summary email instead of individual emails per event
2023-04-24 17:53:16 -04:00
Isaac Connor
ffb4e05089
Missing objdetect.gif should be a debug, not a warning
2023-04-24 08:28:54 -04:00
Isaac Connor
12ecfa7dc9
DOn't start Deleted monitors
2023-04-22 09:54:51 -04:00
Isaac Connor
9b8dd156be
Update s3 support, moving it into the storage object.
2023-04-22 09:54:13 -04:00
Isaac Connor
8862fe9d87
Only start non deleted Monitors
2023-04-19 18:55:48 -04:00
Isaac Connor
4030da1caf
Fix cutnpaste typo
2023-03-26 10:09:25 -04:00
Isaac Connor
c7f6cdd6ce
Always check for Shallow events
2023-03-24 14:19:54 -04:00
Isaac Connor
cb8ec708fc
Add support for aws_bucket and subpath
2023-03-23 10:28:58 -04:00
Isaac Connor
d2751a7254
Move s3 object creation code to a sub s3 in storage so it gets cached.
2023-03-23 10:03:14 -04:00
Isaac Connor
7779af74ad
Populate missing serial field in Storage class
2023-03-19 11:31:12 -04:00
Isaac Connor
687bc3572a
Santizie cpuUserPercent and cpuSystemPercent
2023-03-07 12:02:08 -05:00
Isaac Connor
440ec48653
Must detaint rows and replace all ? with %s
2023-03-07 08:11:00 -05:00
Isaac Connor
f734054b46
zmDbDo instead of perldbi so that serverstats inserts get logged
2023-03-05 12:53:24 -05:00
Isaac Connor
e82451f2bb
Add ZM_WEB_HOMEVIEW option
2023-03-05 10:21:04 -05:00
Isaac Connor
5280c423bb
Add comment explaining cpuload values
2023-03-01 14:08:28 -05:00
Isaac Connor
e08ec34e51
Add CpuUserPercent and CpuSystemPercent to ServerStats
2023-03-01 14:08:09 -05:00
Isaac Connor
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
Isaac Connor
ef9ce9b714
Fix inserts into Server_Stats
2023-02-18 18:02:15 -05:00
Isaac Connor
0cf80c2ac0
Add Deleting of Server_Stats rows after 1 day
2023-02-18 18:02:15 -05:00
Isaac Connor
0879252d13
Add Server Stats table and insert into it in zmstats.pl
2023-02-18 18:02:15 -05:00
Isaac Connor
3e34b36ec0
Fix email structure for ios
2023-02-16 17:24:23 -05:00
Isaac Connor
d750daebbc
Fix NewStorage=>self
2023-02-16 12:17:38 -05:00
Isaac Connor
42da035f27
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-02-16 11:52:27 -05:00
Isaac Connor
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
Isaac Connor
f437aadbe6
Update s3fs url parsing to match that in Event
2023-02-16 11:51:11 -05:00
Isaac Connor
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
Isaac Connor
c50209f66c
Listing dir contents really fills up logs. Make it only report on level 4
2023-02-16 09:30:47 -05:00
Isaac Connor
4b6f47eebd
Fixup email structure so that inline images properly display while also having a text version.
2023-02-15 17:41:19 -05:00
Isaac Connor
03b52a1ee5
Strip https off host and don't use virtualhost method.
2023-02-13 17:27:51 -05:00
Isaac Connor
c6e93036f3
Include command line in debug output when generating images
2023-02-13 14:46:33 -05:00
Isaac Connor
b6c729c700
Improve s3 url parsing and use Net::Amazon::S3::Vendor
2023-02-12 16:49:46 -05:00
Isaac Connor
aba6281296
Fix typo
2023-02-12 16:49:46 -05:00
Isaac Connor
6893a3d84d
Prevent duplicate attachments. Use eri_encode to escape content-id
2023-02-11 15:35:10 -05:00
Isaac Connor
44f75508c8
Attach a text version of body
2023-02-11 12:36:51 -05:00
Isaac Connor
def5a1794c
Don't try to do AWS delete if parsing failed
2023-02-11 12:36:33 -05:00
Isaac Connor
6821be5d17
Add Content-ID to attachments
2023-02-11 09:21:00 -05:00
Isaac Connor
7960496044
Handle https?:// in the host
2023-02-11 09:19:53 -05:00
Isaac Connor
691e21997b
Test out replacing attached image tag with cid based img
2023-02-10 18:49:50 -05:00
Isaac Connor
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
Isaac Connor
f617a20fe5
Adding :80 to address is not worthy of an Error log
2023-02-07 09:11:29 -05:00
Isaac Connor
2884afdef5
Handle Monitor attr which is really MOnitorId
2023-02-07 09:00:42 -05:00
Isaac Connor
a980788394
Update with newer username/password parsing from Path. Implement get/set config, ping, probe
2023-01-31 10:06:06 -05:00
Isaac Connor
ebad3a8411
Make version and telemetry options visible
2023-01-27 15:50:18 -05:00
Isaac Connor
2b789f0051
Properly quote some fields and add missing fields to defaults
2023-01-17 12:54:21 -05:00
Isaac Connor
907d00ffc7
Add ZM_WEB_NAVBAR_STICKY to web options
2023-01-16 16:38:35 -05:00
Isaac Connor
0ec9a9f732
Don't delete archived empty events.
2022-12-09 10:14:59 -05:00
Isaac Connor
8bb80cb1ac
Put back authenticating to '/cgi/ptdc.cgi' instead of /.
2022-12-05 12:50:32 -05:00
Isaac Connor
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
Isaac Connor
1d19d362ae
Add status to debug logging of executeShellCommand
2022-12-04 10:44:03 -05:00
Isaac Connor
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
Isaac Connor
d76fb5e5cb
Unhide the snapshot feature setting
2022-11-30 13:52:24 -05:00
Isaac Connor
6adec2eb37
Add SSL support to Dahua PTZ
2022-11-29 14:03:27 -05:00
Isaac Connor
fd9b59a94b
Improve info when moving event to show source and Dest paths
2022-11-27 17:38:56 -05:00
Isaac Connor
92a82d603b
Fix testing of state in reboot(). Set state in open()
2022-11-24 09:27:49 -05:00
Isaac Connor
7065678065
Fix crash in zmfilter DiskSpace Update when Event doesn't exist
2022-11-22 12:38:48 -05:00
Isaac Connor
e52a77f206
Slightly betr clone
2022-11-17 14:53:19 -05:00
Isaac Connor
3fbfce459c
Clone the Control object because it is not monitor specific
2022-11-17 14:41:55 -05:00
Isaac Connor
2e23aedbbc
Add in clone function
2022-11-17 14:41:41 -05:00
Isaac Connor
f965249ac6
Don't clear Diskspace a second time
2022-11-01 18:42:22 -04:00
Isaac Connor
6e5b4ff6e1
Fix _ instead of __git_main in file::Find::find, clean up use of __git_main
2022-11-01 18:42:10 -04:00
Isaac Connor
7e4f9f49e8
Fix not handling Shallow storage areas
2022-10-14 09:25:58 -04:00
Isaac Connor
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
Isaac Connor
73d9f2482c
Add ZM_LOG_INJECT config parameter to disable unprivileged log injection through api.
2022-10-06 14:51:56 -04:00
Isaac Connor
1e43f55479
Fix spelling
2022-09-28 15:58:59 -04:00
Isaac Connor
9db64b860c
Don't try to close the event if we have no Frame information
2022-09-28 15:58:28 -04:00
Isaac Connor
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
Isaac Connor
812ce283ab
Use zmDbFetchOne instead of incorrect dbFetchOne
2022-09-28 12:37:01 -04:00
Isaac Connor
44fd2f99e0
Add zmSQLExecute and zmDbFetchOne to Exports. Add a debug to zmDbFetchOne
2022-09-28 12:35:48 -04:00
Isaac Connor
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
Isaac Connor
ae07db6104
Implement the close command in zmeventtool.pl
2022-09-28 11:07:31 -04:00
Isaac Connor
3a75f147ec
Implement Event::Close() which fixes up a crashed event.
2022-09-28 11:07:11 -04:00
Isaac Connor
64cae53a52
Include monitor Id in logs, for consistency as well as utility
2022-09-26 09:28:10 -04:00
Isaac Connor
a16e7aad62
Switch to utf8mb4 to support 4 byte unicode which is available since mysql 5.5
2022-09-22 10:15:57 -04:00
VikingGer
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
Isaac Connor
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
Jonathan Bennett
c35bbc8c30
Adds the Janus_pin to shared_memory, and a -j to zmu to fetch it
2022-09-07 15:49:47 -05:00
Isaac Connor
8aaa5e52b3
Merge pull request #3582 from megasaturnv/3516-CaseInsensitiveLogin
...
Issue #3516 case insensitive login
2022-09-06 16:39:53 -04:00
Isaac Connor
46b3edbb10
Add -t option to zmvideo.pl to add transforms like hue=s=0 support
2022-09-06 13:45:16 -04:00
Isaac Connor
783fadc2d4
Make GenearteVideo code handle more options for generating video, including transforms like=hue=s=0
2022-09-06 13:44:53 -04:00
megasaturnv
9d8e32b28c
Modified description for ZM_CASE_INSENSITIVE_USERNAMES
2022-09-05 15:49:26 +01:00
megasaturnv
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
megasaturnv
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
Isaac Connor
29750a56e7
Merge branch 'master' into add_mqtt
2022-08-25 18:37:54 -04:00
Isaac Connor
4c5ec4c01f
Add a Control file for Grandstream cameras
2022-08-17 14:59:02 -04:00
Isaac Connor
dc24be4d99
Test for success loading Control
2022-08-17 14:58:18 -04:00
Isaac Connor
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
Jonathan Bennett
ebd4a30666
Update ZM_MIN_RTSP_PORT description
2022-08-09 15:04:09 -05:00
Isaac Connor
165ccf5820
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2022-08-09 15:48:06 -04:00
Isaac Connor
f09355f2ff
If monitor has Control configured and control supports rebooting, reboot camera on fail to capture.
2022-08-09 13:41:43 -04:00
Isaac Connor
6c0e34e84b
Fix loading info from ControlAddress. Fix path used when testing auth.
2022-08-09 13:41:14 -04:00
ovargasp
6753a04e91
Latest version of zmAlarmServer
2022-08-05 16:46:11 -06:00
ovargasp
8978ebcc3b
Adds Alarm Server for NETSurveillance WEB IP cameras
2022-08-05 15:59:42 -06:00
Robert Jacobson
3190051287
Make proportional and continuous movement actually work
2022-08-04 12:40:31 -04:00
Robert Jacobson
77472492e2
Make zoom buttons work for Axis P5655-E
2022-08-03 09:57:57 -04:00
Isaac Connor
b40423d720
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2022-08-02 20:57:48 -04:00
Isaac Connor
1d40279fcf
Check heartbeat time for monitors that don't do decoding
2022-08-02 20:44:10 -04:00
Isaac Connor
42bb0c41a0
Rename zmc_heartbeat_time to just heartbeat_time
2022-08-02 20:43:49 -04:00
Isaac Connor
d0cbb7b478
Sync up with c++ shm alignment to fix same size of 32bit
2022-07-29 10:27:18 -04:00
Isaac Connor
802ecc293c
Roughed in Uniview PTZ module. Currently is a copy of Hikvision. Only reboot is correct.
2022-07-12 13:25:47 -04:00
Isaac Connor
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
Isaac Connor
7cb08c0ffa
Use ImportanceNumber instead of Importance because Importance is a string
2022-06-24 14:02:32 -04:00
Isaac Connor
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
Isaac Connor
e03d42103b
Return true or false for open
2022-06-24 13:57:59 -04:00
Isaac Connor
0d48c92bc8
Calling zmMemInvalidate when detached should be fine, so turn Error into a debug
2022-06-24 13:57:10 -04:00
Isaac Connor
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
Isaac Connor
4a54931292
Add ZM_TIME_FORMAT_PATTERN
2022-06-01 16:19:51 -04:00
Isaac Connor
5108c016cf
Add ZM_LOCALE_DEFAULT, ZM_DATE_FORMAT_PATTERN and ZM_DATETIME_FORMAT_PATTERN config entries
2022-06-01 15:44:57 -04:00
Isaac Connor
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
Isaac Connor
4f0502fbe9
If shared_data:valid is invalid, disconnect and reconnect before erroring.
2022-05-30 15:43:54 -04:00
Isaac Connor
1fc66d3fbf
Add debug of reason why we are not running a monitor
2022-05-30 09:52:24 -04:00
Isaac Connor
8f5850e404
Turn on debugging of DB requests in Monitor
2022-05-30 09:52:07 -04:00
Isaac Connor
76b844530b
Config entries are not constants, duh
2022-05-19 14:06:30 -04:00
tftadmin Appleton
3d16be1f0f
Only keep ZM_COOKIE_LIFETIME entries in Sessions.
2022-05-18 18:59:37 -04:00
Isaac Connor
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
Isaac Connor
f502883ebe
Move code from Event to Storage to implement delete_path(). Implement delete_analysis_jpegs()
2022-05-17 12:30:49 -04:00
Isaac Connor
34610069ea
Move code from Event to Storage to implement delete_path()
2022-05-17 12:29:46 -04:00
Isaac Connor
4349106270
Rough in zmeventtool with command deleteanalysisjpegs
2022-05-17 12:26:33 -04:00
Isaac Connor
923a98f000
At least test for valid shmem for monitors with capturing=OnDemand or Decoding=OnDemand
2022-05-10 11:46:11 -04:00
Isaac Connor
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