Isaac Connor
|
07704dd5d6
|
coments
|
2017-06-04 17:30:39 -04:00 |
Isaac Connor
|
b6b4738b9f
|
fix quotes
|
2017-06-02 12:31:54 -04:00 |
Isaac Connor
|
71b9ca97c6
|
no need to store filters as an array ref
|
2017-06-02 12:25:26 -04:00 |
Isaac Connor
|
5228b9d008
|
move command line option parsing up, so if we are just getting the version we exit quick before doing a bunch of other things.
|
2017-06-02 11:54:40 -04:00 |
Isaac Connor
|
be5b93a64e
|
whitespace, braces, quotes
|
2017-06-02 11:39:35 -04:00 |
Vladimir Poluyaktov
|
2c9d21f59f
|
1768 fix email tokens for h264 storage (#1814)
* 1768-Fix-email-tokens-for-h264-storage Snapshot extraction impmemented
* 1768-Fix-email-tokens-for-h264-storage: Video file path fixed
* 1768-Fix-email-tokens-for-h264-storage: vframes 1 option added
* 1768-Fix-email-tokens-for-h264-storage: generateImage sub created
* 1768-Fix-email-tokens-for-h264-storage: Few typos fixed
* 1768-Fix-email-tokens-for-h264-storage: Code refactoring. EI1A and EIMA macros added
|
2017-05-16 13:04:42 -04:00 |
Isaac Connor
|
de24ba7120
|
Merge pull request #1779 from vajonam/1778-add-subtituteTags-for-exec
add the ability to add substitued tags to the commandline
|
2017-05-10 09:00:36 -04:00 |
Manojav Sridhar
|
7c765b5516
|
added feature to allow %tags% in arguments of exec command
|
2017-02-15 09:37:45 -05:00 |
Manojav Sridhar
|
f0b2910647
|
fix typo for correct checking if a command has excuted for an event, prevents execution on every filter run
|
2017-02-15 08:10:50 -05:00 |
Andy Bauer
|
254fcbcef7
|
update gpl 2 mailing address in source files
|
2016-12-26 09:23:16 -06:00 |
Andrew Bauer
|
29e48da3b9
|
fix sftp xfers in zmfilter (#1677)
|
2016-11-07 16:08:43 -05:00 |
mdrush
|
69a71b1a37
|
cleaned up logic
|
2016-08-27 16:16:01 -07:00 |
mdrush
|
16a9de3b1b
|
added missing brackets
|
2016-08-27 15:39:04 -07:00 |
mdrush
|
2d161924c0
|
changed error message to debug message
|
2016-08-27 15:34:10 -07:00 |
mdrush
|
52255e594e
|
improved style, added fallback when ssmtp can't be found
|
2016-08-27 15:18:00 -07:00 |
mdrush
|
574390730a
|
added missing ssmtp support in sendMessage
|
2016-08-27 13:10:39 -07:00 |
Isaac Connor
|
85c0377280
|
When generating video, zmvideo.pl now returns the file path to the video file so don't append eventPath to it
|
2016-07-12 14:21:54 -04:00 |
Steve Gilvarry
|
6bf43631e2
|
Merge pull request #1428 from ZoneMinder/better_zmvideo
Better zmvideo
|
2016-04-28 22:00:52 +10:00 |
Andrew Bauer
|
3a9ab7f685
|
Merge branch '1128_ssmtp_mail_option' of https://github.com/dreaddy/ZoneMinder into dreaddy-1128_ssmtp_mail_option
|
2016-04-21 07:27:19 -05:00 |
Isaac Connor
|
67f38d07df
|
Merge branch 'master' into better_zmvideo
|
2016-04-20 12:04:15 -04:00 |
Isaac Connor
|
d3558c5688
|
Merge pull request #1323 from knnniggett/zmfilter
fix missing Net::SFTP::Foreign::debug warning
|
2016-03-21 10:47:50 -04:00 |
Kyle Johnson
|
b9085cea64
|
Fix issue where programs are installed in unexpected paths.
For example, on freebsd, sudo is in /usr/local/bin, and as things
were pre-this commit, sudo wasn't being found.
|
2016-03-11 14:28:16 -07:00 |
Andy Bauer
|
ab3c35c629
|
fix missing Net::SFTP::Foreign::debug warning
|
2016-03-04 17:21:32 -06:00 |
Andrew Bauer
|
748754a213
|
Merge pull request #1209 from adamreiser/StrictKeyChecking
Strict key checking
|
2016-02-04 10:07:19 -06:00 |
Adam Reiser
|
28bf4dfe7b
|
Add option for strict host key checking
|
2015-12-29 16:34:11 -08:00 |
Isaac Connor
|
7a979bb891
|
remove duplicated routines
|
2015-12-17 13:11:15 -05:00 |
Isaac Connor
|
64f65b55cc
|
use new Filter object to do some of the heavy lifting in zmfilter.pl
|
2015-12-17 12:57:14 -05:00 |
dreaddy
|
92401193a7
|
Add missing semicolon
|
2015-11-06 11:19:12 -05:00 |
dreaddy
|
ced0240fc3
|
Use the ssmtp path set in options first. shell command if ssmtp path empty. display debug suggesting set ssmtp path in option.
|
2015-11-06 10:43:30 -05:00 |
dreaddy
|
35617a6cf7
|
#1128 - Added option to enable send email by ssmtp mail. Option for custom ssmtp path. Conditional checks for new options in filter
|
2015-11-02 22:16:10 -05:00 |
Isaac Connor
|
80a294da34
|
tabs to spaces
|
2015-08-27 11:10:13 -04:00 |
Isaac Connor
|
e318c3bf37
|
Add ServerId as a filter option
|
2015-07-15 16:12:35 -04:00 |
Dmitry Smirnov
|
ac685fd247
|
zmfilter.pl: pod2usage + beautification
|
2015-04-11 11:18:21 +10:00 |
Isaac Connor
|
856a8ce1d0
|
minor improvement removing 1 coll to time()
improve logging tell which monitor the event belonged to
|
2015-02-06 09:30:48 -05:00 |
Isaac Connor
|
8ea01e631b
|
Add -v --version command line param to zmfilter.pl
|
2015-01-07 09:00:46 -05:00 |
Stephen Arthur
|
89a603cf27
|
Modified zmfilter.pl.in to fix #652, crashing while processing background filter with no terms
|
2015-01-03 12:45:18 -05:00 |
Kristof Robot
|
643438e3f2
|
zmfilter: Send message for events that are still ongoing
|
2014-12-15 08:15:59 +01:00 |
Kyle Johnson
|
faaf237731
|
Revert "Broke zmfilter.pl.in in order to test travis"
This reverts commit acc158f3cb .
|
2014-01-04 15:10:15 -05:00 |
Kyle Johnson
|
acc158f3cb
|
Broke zmfilter.pl.in in order to test travis
|
2014-01-04 15:04:14 -05:00 |
Kyle Johnson
|
c5afecc2b4
|
Revert "Introducing a bug in zmfilter.pl.in to test travis"
This reverts commit 337750430b .
|
2014-01-02 12:15:06 -05:00 |
Kyle Johnson
|
337750430b
|
Introducing a bug in zmfilter.pl.in to test travis
|
2014-01-02 12:02:07 -05:00 |
Isaac Connor
|
7251a8e1ae
|
fixes to $Config changes, also exit if no EVENT_PATH
|
2013-12-19 13:41:55 -05:00 |
Isaac Connor
|
4d9234089c
|
fix ZM_URL to $Config{ZM_URL}
|
2013-12-19 13:01:52 -05:00 |
Isaac Connor
|
462108583b
|
fix ZM_EVENT_PATH
|
2013-12-19 12:55:14 -05:00 |
Isaac Connor
|
48a6dcf5ce
|
Change COnfig from using the subroutine symbol table to just using a global hash
|
2013-12-16 16:32:02 -05:00 |
stan
|
cad65de5c9
|
Removed temporary module inclusion.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3506 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2011-08-26 09:05:42 +00:00 |
stan
|
5c2149e319
|
Fixed incorrectly quoted patterns to split
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3504 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2011-08-25 20:45:32 +00:00 |
stan
|
b64c506659
|
Added SFTP upload option.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3500 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2011-08-23 14:10:20 +00:00 |
stan
|
6ff385e407
|
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3459 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2011-06-21 09:19:10 +00:00 |
stan
|
7b43ac2645
|
Use JSON encoding for language independent serialisation (filters and control commands) rather than PHP serialisation. Removes dependency on rare PHP::Serialization perl module.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3357 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2011-05-23 16:18:18 +00:00 |