237546de2f
Turn off caching of objects in zmwatch. Remove unneeded zmMemInvalidate. Remove unused include of Storage
2024-01-11 13:59:41 -05:00
72778bd76d
Remove circular reference in Control(), free shm if allocated in destructor
2024-01-11 13:59:10 -05:00
e99f49fcb5
Fix NewPath missing /
2024-01-09 15:34:50 -05:00
13114b2e83
Only do joins if required. Use a subselect on Tags because it is way more efficient that doing the joins.
2024-01-08 17:23:50 -05:00
7f03a84b35
When instantiating an object, and given the data, refresh the cache instead of using an old cached object. This should fix issues with Events where cached properties like Storage and Path use an old value.
2024-01-08 10:02:56 -05:00
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
6f40293e93
Fix incorrect use of zmDbExecute causing emails to not be sent. Fixes #3800
2024-01-04 10:16:38 -05:00
9024e5a479
Include backtrace info when logging sql error
2024-01-04 10:16:07 -05:00
42a284d9ac
Add quotes around dbUser and dbPass to prevent command injection
2024-01-02 14:00:34 -05:00
b39445d5c5
Add quotes around dbUser to prevent command injection
2024-01-02 13:59:17 -05:00
112eb6b9ad
Add support for EISNAP and EPISNAP for snapshot image
2023-12-19 12:27:02 -05:00
d1c52987bd
Add returning both the sth and res
2023-12-19 12:16:36 -05:00
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
29b16a5384
Implement zmDbExecute which is slightly more useful than zmSQLExecute
2023-12-19 10:54:22 -05:00
66e1f968c0
Add a warning when a filter takes longere than it's execution period
2023-12-18 11:40:20 -05:00
591e900fcf
Remove debug
2023-12-18 11:39:52 -05:00
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
803cc8bc1a
Add zmDbSupportsFeature with skip_locked support
2023-12-05 09:42:01 -05:00
6bf0533341
Better logging, only commit if no error.
2023-12-04 14:17:18 -05:00
983ccb7afc
Add support for double in zmMemWrite
2023-12-03 10:37:53 -05:00
4ff215e8bd
Fix for when system_utilisation is empty
2023-11-30 14:38:41 -05:00
3627a4e97d
Add ZM_WEB_VIEWING_TIMEOUT config setting for each bw profile.
2023-11-20 13:25:26 -05:00
d62779b1e8
Include command that failed in Error.
2023-11-16 13:06:52 -05:00
939db57fa9
When command fails, log at Warning instead of Debug.
2023-11-16 13:06:29 -05:00
b6bd1c93ad
Sort output of status by pid.
2023-10-31 09:59:02 -04:00
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
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
eb6baf4365
Importance is an enum, default value should be Normal
2023-10-23 12:51:29 -04:00
eb291b76d1
Better log message when we have a weird value for Importance
2023-10-23 12:49:12 -04:00
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
582245cdaf
Rework new and find to properly handle multi-column primary keys
2023-10-04 17:07:50 -04:00
69e6c56ac3
Add Objects for Tag, Event_Tag and add functions to Event to load them.
2023-10-04 17:07:19 -04:00
3836e7d2a7
The value will be the Tag ID so compare against T.Id not T.Name
2023-10-04 15:57:54 -04:00
fc2198d375
Update Path after changing Storage Area
2023-10-04 10:07:07 -04:00
86e1959378
Use new ZM_PATH_UNAME instead of uname on PATH
2023-09-28 12:59:39 -04:00
87d29f10c6
Use new ZM_PATH_UNAME instead of uname on PATH
2023-09-28 12:59:28 -04:00
243edcc82f
Use new ZM_PATH_RM instead of hard coding path to rm
2023-09-28 12:59:08 -04:00
2a7b8a1dbb
Use https proxy instead of http since we now access an https url
2023-09-23 12:28:18 -04:00
e739b04a97
Add more debugging and event deleting when renumbering
2023-09-22 16:28:35 -04:00
92d3e00db1
Add GROUP BY E.Id to fix mysql complaining about teh aggregate function
2023-09-20 13:35:51 -04:00
25dfbf27f6
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-09-18 17:05:56 -04:00
eea18b1663
Implement event renumbering in zmeventtool
2023-09-18 17:05:32 -04:00
82a7dca63b
SELECTING auto_increment value doesn't work. Must use mysql_insertid
2023-09-18 17:05:10 -04:00
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
f8c89a0405
Merge branch 'master' into tags
2023-09-14 16:42:06 -04:00
bf34db7da2
Log a warning when failed to send an email
2023-09-09 12:04:57 -04:00
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
6fd119157a
Text corrections
2023-08-27 02:00:59 +02:00
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
Isaac Connor
Isaac Connor
Simpler1
Alejandro Criado-Pérez
Jonathan Bennett
sletteland
root