Commit Graph

20934 Commits (ca1ad2e2e46f2f36a971526c6d95bb09ccd5c332)

Author SHA1 Message Date
Isaac Connor d8493a676b Rough in functions to provide a gui to edit linked monitors. Current status is changing monitor_links and showing editing operators. Next up parenthesis. 2022-07-24 20:38:51 -04:00
Isaac Connor 2ba7d4d0b5 Rough in a function Events() to return Event objects from a Filter. 2022-07-24 20:37:32 -04:00
Doug Nazar 262c087800 Use old event unpack() on 32bit systems.
PHP unpack() 64bit formats aren't available on 32bit.
2022-07-24 04:28:37 -04:00
Isaac Connor 5fde6129dd Bump version to 1.37.19 for ONVIF_Alarm_Text changes 2022-07-23 16:10:38 -04:00
Isaac Connor 00c160da0c rename Onvif_Alarm_Txt to ONVIF_Alarm_Text 2022-07-23 16:09:26 -04:00
Isaac Connor 8a8a5fd5c0 rename Onvif_Alarm_Txt to ONVIF_Alarm_Text 2022-07-23 16:09:01 -04:00
Isaac Connor 917c3bd7ba rename Onvif_Alarm_Txt to ONVIF_Alarm_Text 2022-07-23 16:08:42 -04:00
Isaac Connor bfeee1ed09 rename Onvif_Alarm_Txt to ONVIF_Alarm_Text 2022-07-23 16:08:27 -04:00
Isaac Connor a3395df49f Rename ONVIF_Alarm_Txt to ONVIF_Alarm_Text 2022-07-23 16:07:45 -04:00
Isaac Connor d2d5b6e489 Add ONVIF_Alarm_text to zm_create.sql 2022-07-23 16:07:13 -04:00
Isaac Connor b527f532c3
Merge pull request #3538 from dougnazar/fix_ci
Fix ci
2022-07-23 10:15:32 -07:00
Doug Nazar 78962c461b Use docker image for centos 7 2022-07-23 04:05:40 -04:00
Doug Nazar a65e960ce6 Docker image of CentOS 7, GCC 8 & ZoneMinder dependencies 2022-07-23 04:05:38 -04:00
Doug Nazar c030416500 Fix truncation warning. 2022-07-22 19:52:09 -04:00
Doug Nazar 3b69a51ff8 Try to fix warning again that printf might exceed buffer.
The last fix worked on GCC 11 & 12 but broke GCC 8.
2022-07-22 12:00:42 -04:00
Doug Nazar cfa4cdc9a3 Use add_compile_options instead of add_compile_definitions
add_compile_definitions is not available until version 3.12.
2022-07-22 11:05:14 -04:00
Doug Nazar 9c40e2bb86 CI: Remove CI workflow for Debian Stretch
Debian Stretch has finished LTS and is too old for current code base.
2022-07-22 10:36:16 -04:00
Doug Nazar 447fd3efd0 CI/Cirrus: Update to FreeBSD 12.3 2022-07-22 10:20:10 -04:00
Isaac Connor 95530a4f7d
Merge pull request #3529 from dougnazar/fix_printf_formats
Fix printf formats & enable large file support for 32-bit
2022-07-20 11:44:26 -07:00
ovargasp 981769b9db
Allows users to set an specific "Onvif alarm text" for each monitor (#3535)
* Allows users to set an specific "Onvif alarm text" for each monitor

With this personalization the cameras that use strings different to "MotionAlarm"
such as Dahua, will be able to process their Onvif alarms. To make it easier, the change
sets a default "Alarm Text"  value for it to work out of the box and then allows to
modify it according to the particular necessities of each brand. It consists of
a new column on table Monitors, changes on Monitors.h, Monitors.cpp and a change
on UI to manage the value of Alarm Text per camera.

Updated es_la.php language file.

Co-authored-by: ovargasp <ovargasp@hoitmail.com>
2022-07-20 12:51:13 -05:00
Isaac Connor 2c32d09759
Merge pull request #3530 from dougnazar/disable_systemd
Add option to disable auto detection of systemd.
2022-07-16 09:24:54 -07:00
Isaac Connor 84ac9f592f
Merge pull request #3531 from dougnazar/fix_freebsd
Fix compile FreeBSD 13.0
2022-07-16 09:24:22 -07:00
Doug Nazar 5b44ee729d Fix sendfile calling convention taking into account possible null offset parameter. 2022-07-16 10:05:46 +00:00
Doug Nazar df414fc028 Need to cast duration to system_clock resolution. 2022-07-16 10:03:54 +00:00
Doug Nazar 3c5e44dfe5 Need unistd.h for getpid(). 2022-07-16 10:03:16 +00:00
Doug Nazar 0db4a18ff6 Switch to unsigned int for loop to restrict size of printf.
GCC 12 incorrectly detects a format truncation.

src/zm_logger.cpp:86:39: warning: ‘%d’ directive output may be truncated writing between 1 and 11 bytes into a region of size 2 [-Wformat-truncation=]
   86 |       snprintf(code, sizeof(code), "DB%d", i);
      |                                       ^~
src/zm_logger.cpp:86:36: note: directive argument in the range [-2147483647, 9]
   86 |       snprintf(code, sizeof(code), "DB%d", i);
      |                                    ^~~~~~
2022-07-16 03:21:25 -04:00
Doug Nazar ca1cca2ff4 Add _FILE_OFFSET_BITS=64 define to enable large file support on 32-bit. 2022-07-16 03:20:20 -04:00
Doug Nazar 3b21153757 Fix various printf formats for 32bit, 32bit w/_FILE_OFFSET_BITS=64 and 64-bit 2022-07-16 03:18:18 -04:00
Doug Nazar 02a79f79f0 Add option to disable auto detection of systemd. 2022-07-16 03:12:27 -04:00
Isaac Connor 2d335f6e12 Don't reload img steam on auth hash change. Just update the global variable. 2022-07-15 06:47:45 -04:00
Isaac Connor 227b9d0919
Merge pull request #3527 from ovargasp/master
es_la V3
2022-07-14 17:51:22 -04:00
Isaac Connor dd1ee09994 Set C++ standard to 17 2022-07-14 17:48:12 -04:00
ovargasp 00a005e990
Merge pull request #1 from ovargasp/ovargasp-patch-1-(Lang-File-with-OLANG-format)
Version 3 of es_la with OLANG format for prompts
2022-07-14 15:37:00 -06:00
Isaac Connor d8b3be0cc9 delete booleval 2022-07-14 17:33:54 -04:00
Isaac Connor 53931037ed remove booleval 2022-07-14 17:28:15 -04:00
Isaac Connor 1798d95b8b Have working monitorlink expressions 2022-07-14 17:25:51 -04:00
Isaac Connor e4bd2d351a Merge branch 'master' into monitorlink_expressions 2022-07-14 14:42:56 -04:00
Isaac Connor 54a0f5d8df Fixup verifyToken to use refs for strings 2022-07-14 13:53:23 -04:00
Isaac Connor 4caffe4674 Include iostream since we use it 2022-07-14 13:42:54 -04:00
Isaac Connor 3d541eee99 Remove comments about locale 2022-07-14 13:19:39 -04:00
Isaac Connor e84a1477ff put back ?> 2022-07-14 13:19:10 -04:00
Isaac Connor 9ad7ce3823 Remove remaining locale stuff from language files 2022-07-14 13:16:49 -04:00
Isaac Connor 576448e906 Fix memleak when not doing passthrough 2022-07-14 13:10:43 -04:00
Isaac Connor d0ca677207 Fix %u instead of %d for id which is unsigned. Pass string instead of c_str 2022-07-14 12:07:26 -04:00
Isaac Connor 9db65f5c5f Remove unneeded = assignments 2022-07-14 12:03:49 -04:00
Isaac Connor 66f5b9b93d Remove zm_rtsp_server_thread as it isn't used anymore 2022-07-14 12:01:10 -04:00
Isaac Connor fbe70df1b6 use const and just pass string 2022-07-14 11:57:35 -04:00
Isaac Connor 129e712692 Remove redundant assignment 2022-07-14 11:53:05 -04:00
Isaac Connor 61fcd60a40 initialize all members and make lostInterval an int since we can get negative numbers when doing subtraction 2022-07-14 10:58:42 -04:00
Isaac Connor fd566b2212 Pass std::strings by ref 2022-07-14 10:53:47 -04:00