Commit Graph

2781 Commits (2798e6f205f2bb49e7de649e88df71e8d1420e2f)

Author SHA1 Message Date
Isaac Connor f617a20fe5 Adding :80 to address is not worthy of an Error log 2023-02-07 09:11:29 -05:00
Isaac Connor 2884afdef5 Handle Monitor attr which is really MOnitorId 2023-02-07 09:00:42 -05:00
Isaac Connor a980788394 Update with newer username/password parsing from Path. Implement get/set config, ping, probe 2023-01-31 10:06:06 -05:00
Isaac Connor ebad3a8411 Make version and telemetry options visible 2023-01-27 15:50:18 -05:00
Isaac Connor 2b789f0051 Properly quote some fields and add missing fields to defaults 2023-01-17 12:54:21 -05:00
Isaac Connor 907d00ffc7 Add ZM_WEB_NAVBAR_STICKY to web options 2023-01-16 16:38:35 -05:00
Isaac Connor 0ec9a9f732 Don't delete archived empty events. 2022-12-09 10:14:59 -05:00
Isaac Connor 8bb80cb1ac Put back authenticating to '/cgi/ptdc.cgi' instead of /. 2022-12-05 12:50:32 -05:00
Isaac Connor a0de514e8d Add 2>&1 to command to delete event dir so that we get error messages logged. 2022-12-04 10:44:03 -05:00
Isaac Connor 1d19d362ae Add status to debug logging of executeShellCommand 2022-12-04 10:44:03 -05:00
Isaac Connor 06a14f1410 Use object save method for Archive/Unarchive and don't do UpdateDiskSpace if event was deleted. 2022-12-02 15:57:47 -05:00
Isaac Connor d76fb5e5cb Unhide the snapshot feature setting 2022-11-30 13:52:24 -05:00
Isaac Connor 6adec2eb37 Add SSL support to Dahua PTZ 2022-11-29 14:03:27 -05:00
Isaac Connor fd9b59a94b Improve info when moving event to show source and Dest paths 2022-11-27 17:38:56 -05:00
Isaac Connor 92a82d603b Fix testing of state in reboot(). Set state in open() 2022-11-24 09:27:49 -05:00
Isaac Connor 7065678065 Fix crash in zmfilter DiskSpace Update when Event doesn't exist 2022-11-22 12:38:48 -05:00
Isaac Connor e52a77f206 Slightly betr clone 2022-11-17 14:53:19 -05:00
Isaac Connor 3fbfce459c Clone the Control object because it is not monitor specific 2022-11-17 14:41:55 -05:00
Isaac Connor 2e23aedbbc Add in clone function 2022-11-17 14:41:41 -05:00
Isaac Connor f965249ac6 Don't clear Diskspace a second time 2022-11-01 18:42:22 -04:00
Isaac Connor 6e5b4ff6e1 Fix _ instead of __git_main in file::Find::find, clean up use of __git_main 2022-11-01 18:42:10 -04:00
Isaac Connor 7e4f9f49e8 Fix not handling Shallow storage areas 2022-10-14 09:25:58 -04:00
Isaac Connor f305ac668b Update db calls to use zmDbDo which will handle debug and errorl loging. Add a delete from Monitor_Status for Monitors that are set to None 2022-10-12 19:11:55 -04:00
Isaac Connor 73d9f2482c Add ZM_LOG_INJECT config parameter to disable unprivileged log injection through api. 2022-10-06 14:51:56 -04:00
Isaac Connor 1e43f55479 Fix spelling 2022-09-28 15:58:59 -04:00
Isaac Connor 9db64b860c Don't try to close the event if we have no Frame information 2022-09-28 15:58:28 -04:00
Isaac Connor 0b11418c6a Update Execute function: Only add the path if there are no substitutions. Include status in debug output. Reload the Event from DB before updating the Executed flag because the executed command may have changed it. 2022-09-28 12:38:21 -04:00
Isaac Connor 812ce283ab Use zmDbFetchOne instead of incorrect dbFetchOne 2022-09-28 12:37:01 -04:00
Isaac Connor 44fd2f99e0 Add zmSQLExecute and zmDbFetchOne to Exports. Add a debug to zmDbFetchOne 2022-09-28 12:35:48 -04:00
Isaac Connor 3e43a1159a Add EPATH to substitutions and don't add path to execute unless no substitutions are being done 2022-09-28 11:08:06 -04:00
Isaac Connor ae07db6104 Implement the close command in zmeventtool.pl 2022-09-28 11:07:31 -04:00
Isaac Connor 3a75f147ec Implement Event::Close() which fixes up a crashed event. 2022-09-28 11:07:11 -04:00
Isaac Connor 64cae53a52 Include monitor Id in logs, for consistency as well as utility 2022-09-26 09:28:10 -04:00
Isaac Connor a16e7aad62 Switch to utf8mb4 to support 4 byte unicode which is available since mysql 5.5 2022-09-22 10:15:57 -04:00
VikingGer e1a2061ba2
Instar control for 720p CGI devices
Onvif just yielded the absolute basic functions, but especially no presets. This control fills the gap.
2022-09-16 15:14:05 +02:00
Isaac Connor 6936a3547c shared data is frequently not valid or zmc not running. These shouldn't be errors as they generated too much noise. We can generate errors higher up. 2022-09-13 17:59:53 -04:00
Jonathan Bennett c35bbc8c30 Adds the Janus_pin to shared_memory, and a -j to zmu to fetch it 2022-09-07 15:49:47 -05:00
Isaac Connor 8aaa5e52b3
Merge pull request #3582 from megasaturnv/3516-CaseInsensitiveLogin
Issue #3516 case insensitive login
2022-09-06 16:39:53 -04:00
Isaac Connor 46b3edbb10 Add -t option to zmvideo.pl to add transforms like hue=s=0 support 2022-09-06 13:45:16 -04:00
Isaac Connor 783fadc2d4 Make GenearteVideo code handle more options for generating video, including transforms like=hue=s=0 2022-09-06 13:44:53 -04:00
megasaturnv 9d8e32b28c Modified description for ZM_CASE_INSENSITIVE_USERNAMES 2022-09-05 15:49:26 +01:00
megasaturnv 6c0f40f570 Renamed ZM_AUTH_CASE_INSENSITIVE_USERNAMES to ZM_CASE_INSENSITIVE_USERNAMES as name was too long ZoneMinder/zoneminder#3516 2022-09-02 12:03:47 +01:00
megasaturnv 63e5b63eec Added option ZM_AUTH_CASE_INSENSITIVE_USERNAMES to match mixed case usernames to lower case usernames in database ZoneMinder/zoneminder#3516 2022-09-02 11:58:02 +01:00
Isaac Connor 29750a56e7 Merge branch 'master' into add_mqtt 2022-08-25 18:37:54 -04:00
Isaac Connor 4c5ec4c01f Add a Control file for Grandstream cameras 2022-08-17 14:59:02 -04:00
Isaac Connor dc24be4d99 Test for success loading Control 2022-08-17 14:58:18 -04:00
Isaac Connor 6762ec5166 Split out realm detection and use it in sendCmdPost. Our initial query on / doesn't fail as the camera doesn't require authorization for /. 2022-08-16 13:19:29 -04:00
Jonathan Bennett ebd4a30666
Update ZM_MIN_RTSP_PORT description 2022-08-09 15:04:09 -05:00
Isaac Connor 165ccf5820 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-08-09 15:48:06 -04:00
Isaac Connor f09355f2ff If monitor has Control configured and control supports rebooting, reboot camera on fail to capture. 2022-08-09 13:41:43 -04:00
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