Commit Graph

2164 Commits

Author SHA1 Message Date
Isaac Connor e096e0a7fe improve error logging when running as root as can't chown log file 2019-11-30 15:35:09 -05:00
Isaac Connor ce44fd52d8 must reset do_log_rotate! 2019-11-22 10:04:55 -05:00
Isaac Connor 6c997a0bd6 quotes 2019-11-22 10:03:09 -05:00
Isaac Connor c6d5198984 Fix the log Hup handler. It is too heavy. Signals can happen at any time and rotating the logs can pull the dbh connection out from under a running dbi operation. So just set a flag and move the re-init to logPrint 2019-11-22 10:02:50 -05:00
Isaac Connor f1ec455665 Add some debug to logrot 2019-11-21 10:49:23 -05:00
Isaac Connor 1c51c695d9 Remove printMsg, it will be inherited 2019-11-21 10:49:04 -05:00
Isaac Connor e215a6661d Google code style updates, better quotes 2019-11-21 10:45:18 -05:00
Isaac Connor 19d4a2287f When restarting, if the process was already dead, we won't restart it. So add a start call. Fixes #2757 2019-11-20 14:22:12 -05:00
Isaac Connor 1c54f22627 Introduce CSP_REPORT_URI to config and use it when setting up CSP headers as to where to report unsafe inline js to. 2019-11-08 15:18:08 -05:00
Isaac Connor 8d75cba444 quotes, spacing. Fix closing events on monitors other than the specified on the command line monitor 2019-11-06 20:58:07 -05:00
Isaac Connor 24cc45b3e8 Cleanup, handle warnings when output of command is undef 2019-11-06 17:20:24 -05:00
Isaac Connor 276be8fa37 spacing and quotes 2019-10-30 09:26:17 -04:00
Isaac Connor 15d30b45c3 spacing and quotes 2019-10-30 09:25:55 -04:00
Isaac Connor e4256ddd90 Can't use tainting as SOAP::WDSL::Factory::Transport will fail 2019-10-30 09:22:00 -04:00
Isaac Connor 5c715ec96b fix use of printMsg in Netcat 2019-10-21 13:18:50 -04:00
Isaac Connor a486aafa48 spacing 2019-10-21 13:18:30 -04:00
Isaac Connor 370f93c56a toto => to 2019-10-21 10:27:41 -04:00
Isaac Connor 4261550678 Change default css theme to base 2019-10-21 09:39:34 -04:00
Isaac Connor 98d0c4b104 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-10-18 14:14:07 -04:00
Isaac Connor 2619e90e96 add missing sendCmd's, spacing 2019-10-18 14:12:26 -04:00
Isaac Connor 13b02284fe Merge branch 'master' into timezone_as_config 2019-10-18 13:58:22 -04:00
Isaac Connor fdf48c4123
Merge pull request #2726 from externo6/more-filter-options
More filter options
2019-10-16 10:15:58 -04:00
Isaac Connor ebebcad10d Merge branch 'master' of github.com:zoneminder/ZoneMinder 2019-10-16 10:13:31 -04:00
Isaac Connor a3ea0c224e detaint cmd in runSysCmd. code style fixes. Return unknown for Longitude as well 2019-10-16 10:13:18 -04:00
externo6 e232c22b3d Only add % to value if % is not present. 2019-10-16 10:10:23 +01:00
Isaac Connor b63fc0b0e5 Delete linkpath before deleting empty directories. add closedir and some more debugging. Also add popping off that last part of the dir at each loop 2019-10-15 20:44:15 -04:00
externo6 4b71bc75ea Change language to Contains / Not Contains and update perl filter. 2019-10-16 00:35:49 +01:00
Isaac Connor 04c22988ad Add code to delete empty event directories after deleting an event 2019-10-15 15:04:55 -04:00
Isaac Connor 55b1d29927 better error messages when no command is given to zmcontrol 2019-10-08 18:06:52 -04:00
Simpler1 436c46207f Remove dash from IPCC7210W.pm 2019-10-04 22:52:51 -04:00
Isaac Connor 5aa639ff76 use common printMsg 2019-10-03 18:11:54 -04:00
Isaac Connor 5799815c2e Better debugging 2019-10-03 18:09:15 -04:00
Isaac Connor 0515fe51fd debug 2019-10-03 17:59:34 -04:00
Isaac Connor 12f75c32de Fix version 2019-10-03 17:54:41 -04:00
Isaac Connor 783358c932 Import Sony PTZ driver 2019-10-03 17:31:54 -04:00
Isaac Connor 88ca9816fe handle a profile not being a videoEncoder 2019-10-03 17:29:33 -04:00
Isaac Connor 6f5c297265 google code style 2019-10-03 17:28:57 -04:00
Isaac Connor a7f27dddde quotes and more useful sendCmd debugging. 2019-10-03 17:27:46 -04:00
Isaac Connor 714ce0ba60 Add coller info to AUTOLOAD error message when PTZ function isn't defined. Provide parent printMsg function. 2019-10-03 17:27:16 -04:00
Isaac Connor d02aee64e4 Add setting of timezone to Options/Config instead of php.ini 2019-10-02 09:07:18 -04:00
Isaac Connor 766a59884d Don't hard code perl path. Use PERL_EXECUTABLE cmake var 2019-09-23 12:54:27 -04:00
Isaac Connor dfa51c4e3f update of zmtrack.pl. include id in logfile. 2019-09-23 12:38:58 -04:00
Isaac Connor bc33c0bcb5 make zmcontrol log to zmcontrol_id.log 2019-09-23 12:21:59 -04:00
Isaac Connor f0a8595e50 quiet warning caused by server_up being undef for false 2019-09-20 10:36:08 -04:00
Isaac Connor 52c17f9651 Set event_path to '' to prevent warnings 2019-09-17 10:27:38 -04:00
Isaac Connor 30687de918 Handle 0 value for StorageId 2019-09-10 17:20:18 -04:00
Isaac Connor 6b83a62fad allow for StorageId to be 0 2019-09-04 13:35:46 -04:00
Isaac Connor 571082ff95 StorageId clears Path 2019-09-03 12:55:31 -04:00
Isaac Connor d1ac88d301 Now you can have a subpath under the S3 bucket 2019-08-29 17:55:39 -04:00
Isaac Connor ab0a939550 Turn off event dir creation on S3. It's not neccessary. Allow s3fs:// at the beginning of the S3 url 2019-08-29 11:27:58 -04:00
Isaac Connor 93d642304e Add debug line for aws credentials 2019-08-29 09:42:20 -04:00
Isaac Connor efb8711c02 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-08-28 11:43:59 -04:00
Isaac Connor 307fad72be Default to using V4 Signature 2019-08-28 11:43:46 -04:00
Isaac Connor 403ece42dd fix backticks 2019-08-28 09:03:45 -04:00
Isaac Connor cdb8e056b6 Turn off debug in Event 2019-08-27 15:20:30 -04:00
Isaac Connor da15d1b6d6 add a check when saveJPEGs isn't set to determine whether jpegs exist and update saveJPEGs appropriately 2019-08-27 15:18:28 -04:00
Isaac Connor 35d3a7d4fa introduce files, has_capture_jpegs and has_analyse_jpegs functions to use in zmaudit. Improve delete debugging output 2019-08-27 15:17:18 -04:00
Isaac Connor b43093234f Merge branch 'master' of github.com:/ZoneMinder/zoneminder 2019-08-27 13:54:24 -04:00
Isaac Connor bf40421203 Turn on debugging in Event 2019-08-27 13:54:19 -04:00
Isaac Connor 796b99cd5b When no results from Object->load, clear the id in the object 2019-08-27 13:52:52 -04:00
Isaac Connor 547ee749e6 Test for Storage existing when generating path 2019-08-27 13:52:25 -04:00
Isaac Connor b0b27a24aa Add errstr reporting on add_key_filename failure 2019-08-27 13:11:38 -04:00
Isaac Connor 561fcfac7d Fix 2019-08-27 10:01:01 -04:00
Isaac Connor 1e91f5501e MOre debug, fix problems with S3 upload 2019-08-26 20:44:59 -04:00
Isaac Connor f01bedb33e Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-08-26 18:49:12 -04:00
Isaac Connor 5f5d5f691a Add backticks for mysql 8 2019-08-25 12:30:06 -04:00
Isaac Connor 3e84597900 Backtick escape table and column names for mysql8 2019-08-25 11:36:23 -04:00
Isaac Connor 45aa5bd58c Code style, spacing, quotes and documentation 2019-08-22 08:28:42 -04:00
Isaac Connor 74e414eb00 Clean up ugly hack in CopyTo. Do not modify the object resulting in cached crap 2019-08-13 15:33:38 -04:00
Isaac Connor 3368f94c1a
Add code to handleDelay to cancel identical delayed actions. Fixes #2619 (#2681) 2019-08-08 14:38:27 -04:00
Isaac Connor 2e9d72ed63 spacing and extra () 2019-08-08 14:11:24 -04:00
Isaac Connor bf6170bf61 Test for values in aws url and give better errors if Url empty. Don't append events dir to S3 bucket path 2019-08-07 15:47:12 -04:00
Isaac Connor 5cc6b6b0af Fix EIMOD substitution 2019-08-07 11:15:50 -04:00
Isaac Connor aff081ad41 Must commit after COpyTo to release locks 2019-07-24 11:23:13 -04:00
Isaac Connor afa02e436d Upgrade Storage perl object to use parent Object::find 2019-07-24 10:53:56 -04:00
Isaac Connor 99f78c50af Add Updating SecondaryStorageId when using CopyTo 2019-07-24 09:37:38 -04:00
Isaac Connor 98922b6788 Add SecondaryStorageId to Event so that we can update it 2019-07-24 09:37:16 -04:00
Isaac Connor bb653b172c Use hires time to give better bandwidth reporitng 2019-07-23 14:34:26 -04:00
Isaac Connor d4eae18055 Merge branch 'master' into filter_add_copy 2019-07-23 13:06:17 -04:00
Isaac Connor 49621bf652 Only parse Sql if there is a Query in the filter 2019-07-23 12:58:03 -04:00
Isaac Connor fd95ab23e9 Add AutoCopy support 2019-07-23 09:55:27 -04:00
Isaac Connor f9b5c8a1f4 If query is empty don't bother parsing it 2019-07-23 09:55:14 -04:00
Isaac Connor e821553265 Split MoveTo into CopyTo and MoveTo. 2019-07-23 09:54:39 -04:00
Isaac Connor 52e7cde66d If Email has EIMOD, not only attach the image if it exists, but replace %EIMOD% with the link to it 2019-07-11 19:04:51 -04:00
Isaac Connor 44e4d93445 Merge branch 'master' into storageareas 2019-06-24 11:35:36 -04:00
Isaac Connor ad1df8f80a log the response if command fails, and add missing uthentication sections 2019-06-21 11:40:46 -04:00
Isaac Connor 36995de96f Alter option help for EVENT_CLOSE_MODE to reflect that alarm will end the continuous event and start a new one 2019-06-20 15:11:49 -04:00
Isaac Connor db7362dbcb Merge branch 'master' into storageareas 2019-06-20 14:18:47 -04:00
Isaac Connor 3bae7a5432 spaces and parenthesis 2019-06-20 13:28:12 -04:00
Isaac Connor b068428bbc zmcontrol complains about unfinished statement handles. This is because we aren't finishing them in functions in Database.pm 2019-06-20 13:27:42 -04:00
Isaac Connor 9a33e55efc Bump log level to warning if we are restarting any daemons. Daemons should NOT need to be restarted in a healthy system. 2019-06-13 11:53:26 -04:00
Isaac Connor 1928d1153f spacing and quotes 2019-06-11 13:32:15 -04:00
Isaac Connor 2e624522c7
fixes #2294 (#2637) 2019-06-10 09:43:56 -04:00
Isaac Connor 983da41c7a Reduce log level for filter execution from Info to Debug 2019-06-03 09:46:28 -04:00
Isaac Connor 3be0b774bd better error logging 2019-05-23 16:26:21 -04:00
Isaac Connor 4466ef13fd Merge branch 'pliablepixels-crypt-replacement3' into storageareas 2019-05-23 15:21:58 -04:00
Isaac Connor 2bf022d69c Merge branch 'crypt-replacement' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-crypt-replacement3 2019-05-23 14:26:05 -04:00
Isaac Connor bdbbab0d3e Handle no results from get_ProbeMatch() 2019-05-21 17:15:08 -04:00
Isaac Connor 93aeceecfc Merge branch 'crypt-replacement' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-crypt-replacement 2019-05-17 10:18:15 -04:00
Isaac Connor 3888d140a8 Merge branch 'master' into storageareas 2019-05-17 10:16:29 -04:00