Isaac Connor
39e2c9a5a6
Move array_diff down to where it is used
2024-03-21 12:43:01 -04:00
Isaac Connor
2e4133507a
Add Network.pm
2024-03-21 10:34:54 -04:00
Isaac Connor
fda44f6e3f
Fixups for Manufacturer and Model routines. OutputCodec default is 0 as it is NOT NULL. Also Importance is an integer, so default should be 0.
2024-03-21 10:33:03 -04:00
Isaac Connor
586614e2bb
Updates to hash_diff and parseNameEqualsValueToHash
2024-03-21 10:09:02 -04:00
Isaac Connor
789e07297d
Add defaults for control fields
2024-03-21 10:00:05 -04:00
Isaac Connor
c6e71b19dc
Update to add new api credentials, get_config, set_config, reboot, ping and parse ip/auth from Monitor->Path
2024-03-21 09:44:03 -04:00
Isaac Connor
7e26498b80
Get ip/authentication from Monitor->Path if possibile. Add new api components credentials, reboot, ping.
2024-03-21 09:38:06 -04:00
Isaac Connor
62ad1f28fb
Add updating server record with values as well.
2024-03-20 10:38:44 -04:00
Isaac Connor
30408df4ed
Add saving Cpuload when setting run status of server
2024-03-20 10:38:21 -04:00
Isaac Connor
ba19ad3ed6
Don't populate CpuLoad in CpuLoad() as it overwrites stored value. Need to add in proper object support Fixes load being 0
2024-03-20 10:37:55 -04:00
Isaac Connor
6ee529cca5
Fully specify logging functions as we don't actually import them into our namespace
2024-03-20 09:55:34 -04:00
Isaac Connor
62ba0bf903
Add duration to hints for EVENT_CLOSE_MODE and use alternate regexp for pattern
2024-03-14 11:54:15 -04:00
Isaac Connor
19e6e9baf2
Merge pull request #3707 from Simpler1/default_sound
...
feat(sound): Include default alarm sound (again)
2024-03-02 11:11:03 -05:00
Simpler1
7fdc204082
feat(): Custom snapp.ogg sound for ZoneMinder
2024-03-02 10:15:44 -05:00
IgorA100
98a1c73fb2
Add CpuNicePercent, CpuIdlePercent, CpuUsagePercent to Server_Stats
2024-02-26 23:46:49 +03:00
IgorA100
d25a07eb04
Fix: ...
2024-02-26 23:19:28 +03:00
IgorA100
871ca68024
Changing uptime return line parsing for CpuLoad()
...
Changing uptime return line parsing for CpuLoad()
Depending on the locale it could be like this:
16:50:53 up 1 day, 1:10, 3 users, load average: 0.89, 0.94, 1.14
or like this:
16:50:53 up 1 day, 1:10, 3 users, load average: 0.89, 0.94, 1.14
2024-02-26 17:06:23 +03:00
Isaac Connor
4c38d5ba75
Merge branch 'master' into event_start_mode
2024-02-22 16:13:16 -05:00
Isaac Connor
00155dc841
Fix CpuSysPercent to CpuSystemPercent
2024-02-22 16:06:27 -05:00
Isaac Connor
15cdb9e816
Merge branch 'master' into event_start_mode
2024-02-22 10:47:49 -05:00
Isaac Connor
8f35339198
Fix StorageServerId value
2024-02-22 09:06:54 -05:00
Isaac Connor
91aeeb4d60
Fix support for FilterServerId
2024-02-21 16:34:25 -05:00
Isaac Connor
48774d3c31
Handle undefined sort field
2024-02-21 10:06:17 -05:00
Isaac Connor
68e2b19440
Update to use Server module updates and store CpuUsage stats instead of just load
2024-02-20 13:13:27 -05:00
Isaac Connor
93ef297c24
Implement CpuUsage to get data either from /proc/stat or top output.
2024-02-20 13:12:50 -05:00
Isaac Connor
d32b4809af
Add duration mode to eventclosemode
2024-02-17 10:49:25 -05:00
Isaac Connor
efe61f3a83
Remove debug line causing crashes
2024-02-07 16:50:18 -05:00
Isaac Connor
b4e8148c9e
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-02-05 17:40:26 -05:00
Isaac Connor
3bbc01858d
Add codec in mp4 prevent recovery. Use oldest file time to set Event StartTime
2024-02-05 17:40:20 -05:00
Nickolai Golubev
fa9ddac61d
fixed bug in zmfilter.pl.in on line #632 , per https://github.com/ZoneMinder/zoneminder/issues/3811
2024-02-04 01:43:33 -08:00
Charlie Root
dbb8a942d9
Only require URI::Encode if having attachments
2024-01-24 14:27:38 -08:00
Charlie Root
bb8fccea26
Only require Date::Manip if using strtotime
2024-01-24 14:22:27 -08:00
Isaac Connor
01a49657c9
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-01-23 09:55:39 -05:00
Isaac Connor
819225bfe8
Prevent command injection in zmupdate.pl through use of --dir
2024-01-23 09:55:32 -05:00
Isaac Connor
8c33c8ca2a
Restore initial sleep, make Infos into Debugs. Add debugging for sleep behaviour and honour zm_terminate when trying to reconnect to db.
2024-01-22 14:25:57 -05:00
Isaac Connor
0a6139b57d
Rename variable from html to text because it is the text case.
2024-01-17 17:08:35 -05:00
Isaac Connor
f45c787d07
Instead of replacing with empty string, replace with content_id which is the filename and is the behaviour specified in PR #3769
2024-01-17 17:08:35 -05:00
Isaac Connor
8173297346
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-01-16 09:44:28 -05:00
Isaac Connor
c8980c7529
Clean up termLevel() removing stupid code
2024-01-16 09:43:43 -05:00
Isaac Connor
8618900339
If we are not doing an html email, then don't replace with img tags referencing the attachment. Just do the attachment. Introduce %FID% to sub with the id of the filter.
2024-01-15 16:58:54 -05:00
Isaac Connor
a3ede8114c
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-01-13 13:25:23 -05:00
Isaac Connor
dbc9029b3a
Manually commit @schabau's fix for cpu utilisation not working on debian. See PR #3804 . Fixes #3797
2024-01-13 13:25:16 -05:00
Isaac Connor
1d7c69522b
Fix duplicated inner join on Monitors
2024-01-12 13:35:17 -05:00
Isaac Connor
878b521a08
Add replacements for EI1, EIM, EIA1, EIAM when there are no alarm frames.
2024-01-12 13:34:36 -05:00
Isaac Connor
237546de2f
Turn off caching of objects in zmwatch. Remove unneeded zmMemInvalidate. Remove unused include of Storage
2024-01-11 13:59:41 -05:00
Isaac Connor
72778bd76d
Remove circular reference in Control(), free shm if allocated in destructor
2024-01-11 13:59:10 -05:00
Isaac Connor
e99f49fcb5
Fix NewPath missing /
2024-01-09 15:34:50 -05:00
Isaac Connor
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
Isaac Connor
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
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
