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 |
|
Isaac Connor
|
6afd0ccfaf
|
cleanup code and update System column in Config table on zmupdate.pl -f
|
2022-05-04 12:58:49 -04:00 |
|
Isaac Connor
|
7d9525e28b
|
WARNING should be a DEBUG when restarting a process
|
2022-04-28 10:36:06 -04:00 |
|
Isaac Connor
|
5de88b8f9e
|
zmwatch.pl can work if Decoding == Keyframes Only
|
2022-04-13 16:35:17 -04:00 |
|
Isaac Connor
|
906951e450
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2022-04-06 10:37:10 -04:00 |
|
Isaac Connor
|
0e337cd8bf
|
Remove support for Cambozola which no longer works or is needed.
|
2022-04-06 10:37:02 -04:00 |
|
Isaac Connor
|
1f5d7866f7
|
Merge @alabamatoys' work to add focus controls
|
2022-04-06 09:03:27 -04:00 |
|
Isaac Connor
|
5b824f46c4
|
Load monitors when not in multi-server mode.
|
2022-04-04 15:06:34 -04:00 |
|
Isaac Connor
|
8046c21eeb
|
Add parenthesis to make logic more clear
|
2022-04-04 14:53:08 -04:00 |
|
Isaac Connor
|
9d9b363536
|
Add backtrace when no primary key
|
2022-03-31 19:32:34 -04:00 |
|
Isaac Connor
|
f95d184f02
|
Don't restart monitors that aren't decoding
|
2022-03-28 18:02:58 -04:00 |
|
Isaac Connor
|
8f013b55b2
|
Add Capturing, Analysing, Recording defaults. Add Decoding
|
2022-03-28 18:02:44 -04:00 |
|
Isaac Connor
|
55ae6ba4a5
|
rough in Url, UrlToZMS PathToZMS PathToIndex, UrlToIndex UrlToApi PathToApi in SERver object
|
2022-03-28 14:30:08 -04:00 |
|
Isaac Connor
|
a64102c890
|
Must preface config entries with ZM_ because we strip it out later
|
2022-03-21 16:09:29 -04:00 |
|
Isaac Connor
|
4f29875609
|
Fix password config type to be password in db
|
2022-03-21 16:08:13 -04:00 |
|
Isaac Connor
|
67f765bc82
|
Add password as a config entry type
|
2022-03-21 16:08:13 -04:00 |
|
Isaac Connor
|
d08cac052c
|
Add MQTT settings to config
|
2022-03-21 16:08:13 -04:00 |
|
Isaac Connor
|
0850e0db70
|
Remove Enabled test, replace with Capturing and Recording tests
|
2022-03-21 15:56:16 -04:00 |
|
Isaac Connor
|
965e256bbc
|
remove space
|
2022-03-20 19:13:46 -04:00 |
Javier Gonzalez
|
6a2d0fa81a
|
Fix
|
2022-03-09 21:14:25 +01:00 |
|
Javier Gonzalez
|
224d275950
|
Fix
|
2022-03-09 21:13:34 +01:00 |
|
Javier Gonzalez
|
3d093ed8a6
|
Fix monitor not change status when zoneminder state change
|
2022-03-09 21:07:39 +01:00 |
|
Javier Gonzalez
|
4a1dbc884d
|
Fix zmpkg recording status
|
2022-03-09 19:40:04 +01:00 |
|
Javier Gonzalez
|
858ab62fc4
|
Fix when using a custom state
|
2022-03-08 17:10:29 +01:00 |
|
Isaac Connor
|
0785e3571c
|
code style, remove duplicated code.
|
2022-03-08 09:06:31 -05:00 |
|
Isaac Connor
|
a748b0ed0a
|
When connecting to a monitor, if it fails, disconnect. This should fix a bug in zmtrigger and others where it would never reconnect. The idea is that we asked for a successful connection, if it failed, we shouldn't be in a failed connected state, we should be disconnected.
|
2022-03-08 09:06:06 -05:00 |
|
Isaac Connor
|
8fe0cb5e33
|
tidy up the mem_info hash and turn into a hash instead of a pointer to a hash. Check for validity flah before checking sizes. Improve debug logging.
|
2022-03-08 09:04:41 -05:00 |
|
Isaac Connor
|
addfdcd330
|
Remove sets::isin references
|
2022-02-28 15:41:57 -05:00 |
|
Isaac Connor
|
a32b77510d
|
Fix logic on error reporting of failure to connect to db
|
2022-02-28 09:38:54 -05:00 |
|
Isaac Connor
|
e33b41745d
|
Merge branch 'master' into replace_function_concept
|
2022-02-27 14:04:01 -05:00 |
|
Isaac Connor
|
0bcb9d276f
|
code style.
|
2022-02-26 18:25:51 -05:00 |
|
Isaac Connor
|
2bd85089f4
|
Put integers in quotes as well. Proper JSON has all values in quotes. This is important because integers like 0123 are invalid
|
2022-02-26 18:25:51 -05:00 |
|
Isaac Connor
|
2bc0ec269a
|
Merge branch 'master' into replace_function_concept
|
2022-02-15 17:02:03 -05:00 |
|
Isaac Connor
|
b2e0f805bd
|
Add NOT IN case. Also, fix bad SQL when value evals to false. Test for empty string instead. Fixes #3425
|
2022-02-15 10:29:58 -05:00 |
|
Isaac Connor
|
f66a463574
|
Merge branch 'master' into replace_function_concept
|
2022-02-08 12:07:30 -05:00 |
|
Isaac Connor
|
a7dc9d4e36
|
Implement General::jsonLoad
|
2022-02-08 10:14:00 -05:00 |
|
Isaac Connor
|
ac909d404a
|
Use the reported move with x=0 y=0 for autostop in addition to old stop movement code
|
2022-02-03 18:19:07 -05:00 |
|
Isaac Connor
|
ac39be33f5
|
Don't assume filename of mp4. We store it in the event record for a reason. Fixes #3422
|
2022-02-03 17:24:33 -05:00 |
|
Isaac Connor
|
caebef3103
|
Replace uses of Function
|
2022-02-03 12:38:26 -05:00 |
|
Isaac Connor
|
f40279b745
|
Remove active, add capturing, analysing, recording
|
2022-02-03 12:38:09 -05:00 |
|
Isaac Connor
|
f7099bc6cb
|
Replace another use of Function
|
2022-02-03 12:37:51 -05:00 |
|
Isaac Connor
|
10e39b3b13
|
:wqMerge branch 'master' into replace_function_concept
|
2022-02-02 17:08:01 -05:00 |
|
Isaac Connor
|
a4c91e9a3c
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2022-02-02 14:36:15 -05:00 |
|
Isaac Connor
|
339f102196
|
Implement reboot and ping methods for Trendnet PTZ Control
|
2022-02-02 14:36:11 -05:00 |
|
Isaac Connor
|
48fc99a0e3
|
Implement reboot and ping methods for Trendnet PTZ Control
|
2022-02-02 14:34:53 -05:00 |
|
Isaac Connor
|
3feb4fcc51
|
Merge branch 'master' into master
|
2022-02-02 12:28:17 -05:00 |
|
Isaac Connor
|
1c1630e5b4
|
add require Filter and fix missing $
|
2022-02-01 17:23:16 -05:00 |
|
Isaac Connor
|
4d87b49f07
|
Remove weird cutnpaste User modules stuff from top of Filter.pm
|
2022-02-01 17:22:56 -05:00 |
|
Isaac Connor
|
c524298f8e
|
Rough in State module
|
2022-01-27 13:42:46 -05:00 |
|
Isaac Connor
|
86f393565e
|
Remove Function references and swap with appropriate Capturing, Analysing, Recording
|
2022-01-27 13:42:31 -05:00 |
|
Isaac Connor
|
23bfbcd6ce
|
Merge branch 'master' into multistream
|
2022-01-26 10:13:20 -05:00 |
Jonathan Bennett
|
ec9403fb6f
|
Adds Amcrest On-camera Motion Detection
|
2022-01-25 22:38:00 -06:00 |
|
Isaac Connor
|
3cc243b9a8
|
Don't freshing config when doing update. That is it's own command
|
2022-01-24 09:24:16 -05:00 |
|
Jonathan Bennett
|
8125aa633b
|
Merge branch 'ZoneMinder:master' into master
|
2022-01-22 12:20:13 -06:00 |
|
Isaac Connor
|
35efb111ac
|
Add Private to Config
|
2022-01-22 12:30:59 -05:00 |
|
Jonathan Bennett
|
52e48c02b6
|
Add janus_path and janus_secret, allowing for more secure and flexible Janus installs
|
2022-01-21 22:23:41 -06:00 |
|
Isaac Connor
|
27abe85036
|
replace active with analysing, capturing, recording
|
2022-01-13 22:14:44 -05:00 |
|
Isaac Connor
|
3504b13e2a
|
Merge branch 'master' into multistream
|
2022-01-13 12:29:34 -05:00 |
|
Isaac Connor
|
9b8ca69203
|
default interactive to whether we have stdio. So now when running from console it will default to interactive and when running from zmdc.pl will be non-interactive. Do check regardless of ZM_UPDATE_CHECK setting.
|
2022-01-13 12:26:47 -05:00 |
|
Isaac Connor
|
274ffd7da0
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2022-01-13 12:02:14 -05:00 |
|
Isaac Connor
|
3cc1b74b4e
|
Merge branch 'master' into multistream
|
2022-01-13 10:21:58 -05:00 |
|
Isaac Connor
|
162e12bf92
|
default interactive to whether we have stdio. So now when running from console it will default to interactive and when running from zmdc.pl will be non-interactive. Do check regardless of ZM_UPDATE_CHECK setting.
|
2022-01-13 10:21:32 -05:00 |
|
Isaac Connor
|
58bd09d83d
|
Fix debug output from zmDbDo
|
2022-01-13 09:56:04 -05:00 |
|
Isaac Connor
|
3ec6c7e32f
|
Fix behaviour of update check to support interactive mode. Use zmDbDo functions to simplify code. When interactive print out lastVersion, latestVersion and currentVersion
|
2022-01-13 09:55:26 -05:00 |
|
Isaac Connor
|
3dad3a5200
|
update description to reflect that zmupdate.pl now does all the things it will someday do. Meantion how -c works better. When in interactive mode, check once and print out the result instead of daemonising. Fix formatting osf usage
|
2022-01-13 09:55:16 -05:00 |
|
Isaac Connor
|
e4f0c7cd98
|
Fix debug output from zmDbDo
|
2022-01-13 09:54:47 -05:00 |
|
Isaac Connor
|
b178b0af5e
|
Fix behaviour of update check to support interactive mode. Use zmDbDo functions to simplify code. When interactive print out lastVersion, latestVersion and currentVersion
|
2022-01-13 09:54:36 -05:00 |
|
Isaac Connor
|
cb1cbed8e7
|
update description to reflect that zmupdate.pl now does all the things it will someday do. Meantion how -c works better. When in interactive mode, check once and print out the result instead of daemonising. Fix formatting osf usage
|
2022-01-13 09:37:54 -05:00 |
|
Isaac Connor
|
e4693c251c
|
add backticks around field names because some like Function are reserved
|
2022-01-12 23:08:29 -05:00 |
|
Isaac Connor
|
8d06175024
|
Rework to use ZoneMinder::Monitor class. Simplify loadMonitors and get rid of loadMonitor. Add in ServerId change handling.
|
2022-01-12 23:07:48 -05:00 |
|
Isaac Connor
|
9243b1d081
|
Add debugging to zmDbDo
|
2022-01-11 12:43:42 -05:00 |
|
Isaac Connor
|
152efd0987
|
make aud_print add a newline if printing. Tidy up Event Summary updating, using zmDbDo.
|
2022-01-11 12:39:52 -05:00 |
|
Isaac Connor
|
1891537e91
|
Remove redundant logLevel from docs
|
2022-01-11 12:38:57 -05:00 |
|
Isaac Connor
|
3dcfd3e26e
|
reduce debug logging
|
2022-01-11 12:02:33 -05:00 |
|
Isaac Connor
|
fd3a70172d
|
Merge branch 'master' into multistream
|
2022-01-10 17:51:50 -05:00 |
|
Jonathan Bennett
|
1333d8c751
|
Adds ONVIF Motion Detection Support
|
2022-01-06 16:45:15 -06:00 |
|
Isaac Connor
|
99900e8c1d
|
Merge branch 'master' into multistream
|
2022-01-05 18:04:10 -05:00 |
|
Isaac Connor
|
aefed4e174
|
Merge branch 'master' into multistream
|
2022-01-05 18:03:44 -05:00 |
|
Isaac Connor
|
bc67493f91
|
Alter log level of restart events based on Importance setting
|
2022-01-05 16:49:20 -05:00 |
|
Isaac Connor
|
bfac696fb7
|
return logger from loginit so that we can use it
|
2022-01-05 16:49:00 -05:00 |
|
Isaac Connor
|
cce24ea427
|
Add RTSPServer and Importance fields
|
2022-01-05 16:48:46 -05:00 |
|
Isaac Connor
|
6bd04de5f6
|
Merge branch 'master' into multistream
|
2021-12-31 17:53:36 -05:00 |
|
Isaac Connor
|
2aacbf790a
|
handle warning due to not defined last_run
|
2021-12-26 11:51:32 -05:00 |
|
Isaac Connor
|
d86456b6f2
|
revamp, using ZoneMinder::Monitor methods to reduce code. Reduce last analysze time was zero to a debug. Fixes #3389
|
2021-12-15 09:11:55 -05:00 |
|
Isaac Connor
|
12ebdacf54
|
specify ZoneMinder::Database for zmSQLExecute
|
2021-12-15 09:11:55 -05:00 |
|
Isaac Connor
|
fe0e4627ef
|
Specify ZoneMinder::General for runCommand
|
2021-12-15 09:11:55 -05:00 |
|
Isaac Connor
|
28d5614da0
|
Fix missing ;
|
2021-12-15 09:11:55 -05:00 |
|
Isaac Connor
|
f683557b0e
|
Fix Monitor::Control to handle local cameras
|
2021-12-15 09:11:55 -05:00 |
|
Isaac Connor
|
4fa804e9a2
|
Can only SKIP LOCKED if locking rows. Remove FOR SHARE as it isn't supported on < mysql 8
|
2021-12-14 13:33:00 -05:00 |
|
Isaac Connor
|
fe72fd83f8
|
Fix auth not getting realm from auth headers due to them being an array now. Get auth and ip from Path if not set in ControlAddress.
|
2021-12-14 10:04:35 -05:00 |
|
Isaac Connor
|
a65f2b42ce
|
Implement per-filter delays using the ExecuteInterval member of Filters. Remove uneded lockandload when doing row locks. We will have already locked when executing the filter sql.
|
2021-12-13 14:59:38 -05:00 |
|
Isaac Connor
|
0382a677df
|
Add ExecuteInterval to Filter Object. Allow empty sort_field to have the effort of not sorting. Always add FOR SHARE which adds a read-only lock the returned records. Add SKIP LOCKED functionality so that filters can simply skip locked records. This should reduce contention. Also specify FOR UPDATE of the events table, otherwise we also lock Monitors and Storage.
|
2021-12-13 14:58:32 -05:00 |
|
Isaac Connor
|
ef13c84d8b
|
fix zmtrigger. Need {}
|
2021-12-12 17:01:12 -05:00 |
|
Isaac Connor
|
ed360348ef
|
spacing, remove dead code. If Monitor Function becomes None, skip it
|
2021-12-10 15:36:47 -05:00 |
|
Isaac Connor
|
aa320cb28f
|
Fix missing STATE_UNKNOWN
|
2021-12-10 15:35:53 -05:00 |
|
Isaac Connor
|
35bca1d89b
|
When launching concurrent zmfilter, use the id instead of Name because Name isn't necessarily unique
|
2021-12-06 10:32:17 -05:00 |
|
Isaac Connor
|
3b84d7d82a
|
Add --daemon to command line documentation so it ends up in man page. Fixes #3393. Improve the description and move the pod documentation to the bottom after __END__. Improve executeCommand a bit
|
2021-12-06 10:28:02 -05:00 |
maddios
|
b47e96d7cf
|
Fix Copy/Move to Default Storage
When moving from a 2nd storage to Default it fails with "New storage does not have an id. Moving will not happen" because the default ID is 0.
|
2021-11-29 00:20:25 -05:00 |
|
Isaac Connor
|
f9f2615d48
|
Return if unable to lock the event record. Improve code around CopyTo call.
|
2021-11-26 15:26:38 -05:00 |
|
Isaac Connor
|
af5436d009
|
Handle bug where a value of '' will prevent special case handling. Allow '' to mean NULL when specifying Storage Area
|
2021-11-26 10:31:54 -05:00 |
|
Isaac Connor
|
ffdb0f9824
|
If we are starting a process that is waiting to term, mark it to get started by the reaper. Fixes case where zmdc thought the process was still running and so didn't start it. We never noticed because zmwatch would eventually notice. The result is instant restart.
|
2021-11-23 11:05:39 -05:00 |
|
Isaac Connor
|
40e7f607f5
|
If no protocol defined, fall back to the name of the Control
|
2021-11-22 11:38:40 -05:00 |
|
Isaac Connor
|
2c798069d3
|
improve debug logging when loading Control in Monitor
|
2021-11-18 18:12:07 -05:00 |
|
Isaac Connor
|
20629fdf5a
|
Include Manufacturer and Model in telemetry
|
2021-11-16 09:20:14 -05:00 |
|
Isaac Connor
|
df88c5bbef
|
layout->layer
|
2021-10-28 15:28:03 -04:00 |
|
Isaac Connor
|
4122ae99a5
|
add a comment about rollbacks
|
2021-10-28 15:27:45 -04:00 |
|
Isaac Connor
|
644c6e6b41
|
Just return the error
|
2021-10-28 11:48:08 -04:00 |
|
Isaac Connor
|
9fe2762bc8
|
Add mp4 as an option for generated video and make it the default instead of avi
|
2021-10-28 10:46:50 -04:00 |
|
Isaac Connor
|
6478999ecf
|
Fix Event count subsitutions in emails because they are no longer in Monitor_Status. They are in Event_Summaries. So create a new object for them and use it.
|
2021-10-27 12:21:03 -04:00 |
|
Isaac Connor
|
a74b785d08
|
Move the protocol loading into the Monitor Object.
|
2021-10-26 18:15:43 -04:00 |
|
Isaac Connor
|
a2ec18be5a
|
Implement Control() function to implement the Protocol Specific Control object
|
2021-10-26 18:15:43 -04:00 |
|
Isaac Connor
|
d62d88a0a3
|
add utility functions parseNameEqualsValueToHash and hash_diff
|
2021-10-26 18:15:43 -04:00 |
|
Isaac Connor
|
c864d0765b
|
Update, add url parsing to match other control scripts. Add getConfig and setConfig
|
2021-10-26 18:15:43 -04:00 |
|
Isaac Connor
|
cebe86feb2
|
Make ZoneMinder::Control ingerit from Object. Make loadMonitor use MonitorId
|
2021-10-26 18:15:43 -04:00 |
|
Isaac Connor
|
509cecf9f5
|
Skip image checking capturing==Ondemand
|
2021-10-25 16:52:20 -04:00 |
|
Isaac Connor
|
72d2b99ca4
|
Add last_viewed_time
|
2021-10-25 16:51:57 -04:00 |
|
Isaac Connor
|
5e21d4833a
|
Remove dead code, remove locking from CopyTo, put locking into MoveTo.
|
2021-10-25 11:09:29 -04:00 |
|
Isaac Connor
|
9169da6963
|
Only start a transaction if we are not already in a transaction
|
2021-10-25 11:09:06 -04:00 |
|
Isaac Connor
|
6fd33b4627
|
Change commands used to set and goto presets. Fixes #3371
|
2021-10-13 10:42:23 -04:00 |
|
Isaac Connor
|
a99f9091fc
|
remove useless commit.
|
2021-09-25 14:27:10 -04:00 |
|
Isaac Connor
|
7748307c5a
|
More new defaults. The navbar refreshes every 60 secs so make full page refresh be 240sec. Ajax timeout needs to be 10 seconds. Large event listings can take longer than 3
|
2021-09-23 16:39:35 -04:00 |
|
Isaac Connor
|
d3cfd3c224
|
Set new defaults for various settings
|
2021-09-23 16:39:35 -04:00 |
ColorfullyZhang
|
f5d8eaa2ad
|
Set character set as utf8 when connect to mysql to avoid mistakes when there are Chinese characters in storage path.
|
2021-09-16 18:24:37 +08:00 |
|
Isaac Connor
|
c2472894be
|
Fix html emails when using ZM_NEW_MAIL_MODULES. Improve debugging and reduce Info logging
|
2021-09-10 13:47:40 -04:00 |
|
Isaac Connor
|
c5b097af0a
|
Only suspend/resume motion detection if the monitor is doing motion detection
|
2021-09-08 13:57:46 -04:00 |
criadoperez
|
4a717820b1
|
Fixed broken wiki links
|
2021-09-08 15:18:52 +02:00 |
|
Isaac Connor
|
263a846251
|
Add missing fields. defaults need to be quoted because they are evalled
|
2021-09-04 10:43:38 -04:00 |
|
Isaac Connor
|
440bb12a9a
|
defaults need to be quoted because they are evalled
|
2021-09-04 10:43:25 -04:00 |
|
Isaac Connor
|
1a0d488457
|
Spacing
|
2021-08-30 13:32:43 -04:00 |
|
Isaac Connor
|
248ca9a5f9
|
Fix building SQL for ExistsInFileSystem PostCondition. Fix how we turn the rows into Event objects. Fix value handling in ExistsInFileSystem post condition.
|
2021-08-12 13:41:17 -04:00 |
|
Isaac Connor
|
91903d2822
|
Fix user summary, as there must be a space between -u and dbuser, etc
|
2021-08-05 13:30:52 -04:00 |
|
Isaac Connor
|
14047bc820
|
Test for existence of file before adding it to zip. Apparently our glob can return the snapshot.jpg string even if it doesn't exist. This is a workaround to Archive::Zip not testing for failure and crashing. Fixes #3313
|
2021-07-08 11:03:56 -04:00 |
|
Isaac Connor
|
e9845d96f4
|
Fix Archive FTP .zip filename not including monitor name. Fixes #3304
|
2021-06-23 10:30:42 -04:00 |
|
Isaac Connor
|
9438445d74
|
Fix PTZ Diagonal cmds. Fixes #3300
|
2021-06-16 15:56:08 -04:00 |
|
Isaac Connor
|
94634f1ca7
|
Spacing
|
2021-06-14 13:31:05 -04:00 |
|
Isaac Connor
|
d221d6ab3b
|
If we fail to suspend/resume, assume we need to disconnect/reconnect to the mmap
|
2021-06-14 13:30:37 -04:00 |
|
Isaac Connor
|
da208457b8
|
Fix EndTime case handling.
|
2021-06-14 11:58:23 -04:00 |
|
Isaac Connor
|
0cbb132f08
|
merge fixes from #3295. Fixes #3295.
|
2021-06-14 09:52:10 -04:00 |
|
Isaac Connor
|
9001327883
|
Fix incorrect use of == instead eq
|
2021-06-14 09:45:08 -04:00 |
|
Isaac Connor
|
3d70e621b2
|
zmstats.pl: add use warnings. Fix log deletion only ever deleting 100 when it should delete more in a loop. Add deleting more than 100 sessions. Fix loop not terminating on Ctrl-C
|
2021-06-08 16:54:41 -04:00 |
|
Isaac Connor
|
7417d32fbc
|
Add a 5 second timeout when setting suspending/resuming motion detection.Log errors appropriately
|
2021-05-28 10:29:44 -04:00 |
|
Isaac Connor
|
bdae5dd9f8
|
Sort field should be StartDateTime not StartTime
|
2021-05-12 10:32:03 -04:00 |
|
Isaac Connor
|
c080dd8a12
|
Fixes #2992. If no definition for a monitor is found, don't modify it.
|
2021-05-11 15:29:10 -04:00 |
|
Isaac Connor
|
9ee5e983d6
|
Add ZM_FEATURES_SNAPSHOTS to Config. Fix true=>yes
|
2021-05-04 13:19:10 -04:00 |
|
Isaac Connor
|
91a09608ea
|
Use newlines to make debugging sql easier to read.
|
2021-05-02 13:37:26 -04:00 |
|
Isaac Connor
|
202c4ef28c
|
copy array_diff sub into Object so we don't have the dependency
|
2021-04-29 19:00:36 -04:00 |
|
Isaac Connor
|
e32771c255
|
Add Zones() to Monitor
|
2021-04-29 14:49:39 -04:00 |
|
Isaac Connor
|
69098ccdcb
|
Implement changes() in Object
|
2021-04-29 14:49:30 -04:00 |
|
Isaac Connor
|
a8bd1662e3
|
Add objdetect.gif support in filter email replacements
|
2021-04-28 19:12:37 -04:00 |
|
Isaac Connor
|
2302d814f2
|
Fix version test. split takes a regexp, so '.' matches everything. So change it to /\./.
|
2021-04-28 13:25:01 -04:00 |
|
Isaac Connor
|
c50c30c6b5
|
Add super command line param to use mysql --defaults-file instead of zmuser/zmpass. This will only work for debian based systems.
|
2021-04-28 10:03:26 -04:00 |
|
Isaac Connor
|
df754f0085
|
Can't do suspend in sendCmd
|
2021-04-24 19:22:17 -04:00 |
|
Isaac Connor
|
8d4c2afda8
|
Can't do suspend in sendCmd
|
2021-04-24 12:00:38 -04:00 |
|
Isaac Connor
|
4843cb8593
|
Add ModectDuringPTZ and suspend and resume functions
|
2021-04-23 14:52:29 -04:00 |
|
Isaac Connor
|
e256d9a5a8
|
Use ZoneMinder::Monitor->find_one instead of zmDbGetMonitor so that we get an object with useful methods
|
2021-04-23 14:52:29 -04:00 |
|
Isaac Connor
|
36ac473ad2
|
Add suspend/resume of MotionDetection of ModectDuringPTZ is off.
|
2021-04-23 14:52:29 -04:00 |
|
Isaac Connor
|
7c70c26fbd
|
Cleanup old Continuous stop. Rename lastMove to LastCmd and implement for Zoom
|
2021-04-21 14:30:02 -04:00 |
|
Isaac Connor
|
79cede7cac
|
Merge branch 'release-1.34'
|
2021-04-20 09:24:49 -04:00 |
|
Isaac Connor
|
ed58447c4d
|
Only update event StorageId when the new StorageId has a value
|
2021-04-19 17:53:08 -04:00 |
|
Isaac Connor
|
7485735e9c
|
Change url used for authentication to magicBox.cgi?action=getDeviceType
|
2021-04-19 17:31:22 -04:00 |
|
Isaac Connor
|
6225b8babe
|
Indicate that there should be a space after single char options and their value
|
2021-04-19 11:56:59 -04:00 |
root
|
200dda11a2
|
Merge branch 'continuous' into cont_mast
|
2021-04-16 10:07:10 -04:00 |
|
Isaac Connor
|
c9c4224dd2
|
Change url used for authentication to magicBox.cgi?action=getDeviceType
|
2021-04-14 17:19:07 -04:00 |
|
Isaac Connor
|
7489c3850d
|
Store last command for continuous moves so that moveStop can send the correct stop command
|
2021-04-14 17:19:01 -04:00 |
|
Isaac Connor
|
4ead6886a3
|
Make shm debug level 3
|
2021-04-10 15:40:37 -04:00 |
|
Isaac Connor
|
da630f7534
|
Move shm Memory debug statements to level 2.
|
2021-04-10 15:35:24 -04:00 |
|
Isaac Connor
|
60970673c7
|
Implement debug levels in perl side. DEBUG==DEBUG1.
|
2021-04-10 15:35:04 -04:00 |
|
Isaac Connor
|
3bdd3c0d12
|
Move event summaries to their own table to reduce contention on Monitor_Status
|
2021-04-09 10:16:35 -04:00 |
|
Isaac Connor
|
30dfadcbf1
|
Add some parenthesis and use logic and/or install of binary
|
2021-04-07 14:15:55 -04:00 |
|
Isaac Connor
|
cc33718a2e
|
fix did you forget to declare my $deleteLogByRowsSth?)
|
2021-04-01 12:22:30 -04:00 |
|
Isaac Connor
|
1fd9361e4e
|
use zmDbDo to replace many lines of code
|
2021-04-01 09:27:49 -04:00 |