mirror/zoneminder
1
0 Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-10-03 07:55:22 -04:00
Code Issues Packages Projects Releases Wiki Activity
23,243 Commits 106 Branches 107 Tags
b4e8148c9e190f5d11b6496cd2a2f79b2e85a2e2
Commit Graph
2822 Commits
Author SHA1 Message Date
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
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