Pliable Pixels
ebaafef607
Ffmpeg logs optional ( #2345 )
...
* make ffmpeg logs configurable via web
* fix Info
2018-12-14 08:01:23 -05:00
Isaac Connor
b61eb7d4fc
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-12-13 10:53:56 -05:00
Isaac Connor
0c5eead929
Merge branch 'master' into fix_startup_db_connection
2018-12-13 10:53:34 -05:00
Isaac Connor
0c7f91c38a
Merge branch 'master' into storageareas
2018-12-03 16:25:28 -05:00
Isaac Connor
f2f1e230d1
put back missing !
2018-12-03 16:25:03 -05:00
Isaac Connor
df0b600431
Merge branch 'master' into storageareas
2018-11-29 10:49:06 -05:00
Isaac Connor
45a9f9158d
spelling mistakes
2018-11-29 10:45:30 -05:00
Isaac Connor
3f4e918b9e
Merge branch 'zmaudit_check_other_storageareas' into storageareas
2018-11-26 15:09:14 -05:00
Isaac Connor
d6fb4e1910
Add StorageId function to clear Storage when you set a new StorageId. Clear Path when assigning a new StorageArea
2018-11-26 15:09:04 -05:00
Isaac Connor
dea5db9dd9
Merge branch 'zmaudit_check_other_storageareas' into storageareas
2018-11-23 11:11:39 -05:00
Andrew Bauer
e5f2212a32
fix gpl mailing address
2018-11-15 20:00:53 -06:00
Isaac Connor
35b439629c
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-11-13 18:14:35 -05:00
Isaac Connor
d2dc23b4e9
fixes, better logging
2018-11-13 16:35:09 -05:00
Isaac Connor
73c52705f2
Merge branch 'fix_32bit_alignment' into storageareas
2018-11-13 14:22:06 -05:00
Isaac Connor
e8ed1367d7
Merge branch 'master' into storageareas
2018-11-13 14:22:00 -05:00
Isaac Connor
798bf68df1
add function time_of_youngest_file to determine the youngest file in an event dir, so as to guess the starttime of the event.
2018-11-13 14:13:32 -05:00
Isaac Connor
31b0ed107d
remove epadding2, to restore the 64bit alignment of startup_time. A proper fix instead of #2258
2018-11-13 14:02:44 -05:00
Isaac Connor
07d6d799ce
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-11-13 10:30:58 -05:00
Isaac Connor
993da131f1
tidy up and use Error instead of Carp::croak
2018-11-13 10:29:19 -05:00
Isaac Connor
1e98ecb595
Sort keys in to_string
2018-11-09 12:14:39 -05:00
Isaac Connor
5f81e9111f
Add Scheme and SaveJPEGs to Event fields, and fix setting Scheme
2018-11-09 12:14:05 -05:00
Andrew Bauer
d6877b763d
Merge pull request #2298 from connortechnology/log_use_global_dbh
...
Use the global dbh in ZoneMinder::Database instead of keeping our own…
2018-11-07 12:29:11 -06:00
Isaac Connor
0e3eb0df17
remove extra quotes, google code style, update pod docs
2018-11-07 11:26:48 -05:00
Isaac Connor
0ebcef7324
in poddoc and over needs a =back
2018-11-07 11:01:12 -05:00
Isaac Connor
56bdd53757
Use the global dbh in ZoneMinder::Database instead of keeping our own copy of it in Logger
2018-11-07 10:40:44 -05:00
Isaac Connor
93bf05be4e
Merge branch 'zmrecover' into storageareas
2018-11-06 20:37:35 -05:00
Isaac Connor
9a96785fa4
Add in Frame.php
2018-11-06 20:37:00 -05:00
Isaac Connor
5a6ffe758a
Merge branch 'zmrecover' into storageareas
2018-11-06 15:29:02 -05:00
Isaac Connor
181a8c29e1
Add SaveJPEGs to Event
2018-11-06 15:28:37 -05:00
Isaac Connor
6d6d25261f
Merge branch 'zmrecover' into storageareas
2018-11-06 12:14:54 -05:00
Isaac Connor
3cd1887d54
Cleanup POSIX use. Fix conflict between POSIX and Date::Format.
2018-11-06 12:14:42 -05:00
Isaac Connor
aa9bb81b61
Merge branch 'zmrecover' into storageareas
2018-11-06 09:57:01 -05:00
Isaac Connor
e0bc0484d4
Add empty string default for DefaultVideo
2018-11-06 09:56:29 -05:00
Isaac Connor
18b327b4ac
Turn off massive debugging
2018-11-06 09:55:53 -05:00
Isaac Connor
e1a5940254
Merge branch 'zmrecover' into storageareas
2018-11-05 16:53:01 -05:00
Isaac Connor
451c42ddf5
Implement rmrecover script. Flush out Object code to support find, find_one, find_sql, improve to_string, etc.
2018-11-05 16:52:34 -05:00
Isaac Connor
4b24bf4e36
merge from storageareas, fully specify Module for zmDbDisconnect as we havn't 'used' it
2018-11-02 11:48:35 -04:00
Isaac Connor
372c6b7f69
explicitly call ZoneMinder::Database::zmDbDisconnect
2018-10-17 20:57:24 -04:00
Isaac Connor
7149576a7c
Merge branch 'smarter_packetqueue' into storageareas
2018-10-15 10:59:50 -04:00
Andrew Bauer
7ffc5ab266
Merge branch 'master' into control_plugin_psia
2018-10-11 09:32:06 -05:00
Isaac Connor
1958351a13
Merge branch 'master' into storageareas
2018-10-09 10:24:24 -04:00
Isaac Connor
56b31becb2
Add explicit db disconnect in Fatal(). If we don't disconnect then we leave sockets hanging around in TIME_WAIT (I think).
2018-10-04 10:47:38 -04:00
Isaac Connor
33bd30fbbd
Merge branch 'master' into storageareas
2018-09-28 13:40:18 -04:00
Isaac Connor
d45406bce7
ode style and some more debug
2018-09-28 11:50:34 -04:00
Isaac Connor
e6f366c5cb
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2018-09-28 09:48:37 -04:00
Isaac Connor
5fd1034b0b
Add ServerId to perl Logging to DB
2018-09-25 13:53:50 -04:00
Isaac Connor
af69dab9c5
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2018-09-22 14:58:28 -04:00
Isaac Connor
6aa71dfc11
Fix calculation of LinkPath, as it was using RelativePath instead of Path
2018-09-21 10:31:11 -04:00
Jonathan Lassoff
c7e1e7b901
Control plugin for Dahua PTZ cameras ( #2192 )
...
* Control plugin for Dahua PTZ cameras
* Update http/https protocol handling
* Update doc and license
* Remove license from top of file
* Use named regex capture groups for ControlAddress parsing
* Remove trailing whitespace in Trendnet.pm
2018-09-20 12:29:54 -04:00
Isaac Connor
f2a117c85b
fix undefined $event
2018-09-14 11:06:08 -04:00
Isaac Connor
ca3fd5ddf8
get rid of deleteEventFiles function. People should use the object method
2018-09-14 10:08:35 -04:00
Isaac Connor
11137d271e
Create utility functions in event for creating linkPath and idPath. Replace the code in Generate::createEventPath with using these nice new functions
2018-09-14 10:06:36 -04:00
Isaac Connor
63bed3af10
replace all uses of getEventPath with object function event->Path(). Remove getEventPath
2018-09-14 09:23:09 -04:00
Jonathan Lassoff
7bcf9d59e1
Use named regex capture groups.
2018-09-12 12:55:31 +00:00
Isaac Connor
684f48979a
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-09-11 14:30:19 -04:00
Isaac Connor
9e8a876101
Fix finding Storage by ServerId
2018-09-09 13:28:11 -04:00
Isaac Connor
b7aa11f109
Fix infinite loop reconnecting to db in Logging
2018-09-07 16:30:24 -04:00
Isaac Connor
def72b8e66
tidy up license
2018-09-07 16:29:59 -04:00
Isaac Connor
730e1fda37
We only use File::Slurp when moving files to s3fs so only require it if doing that
2018-09-05 10:14:45 -04:00
Isaac Connor
c34f899d31
eliminate warning when no Storage area is set.
2018-09-04 13:57:35 -04:00
Andrew Bauer
13558b2c12
convert existing http urls in help text to markdown
2018-09-04 07:39:46 -05:00
Jonathan Lassoff
4deaa49048
Remove license from top of file
2018-09-04 10:48:28 +00:00
Andy Bauer
ce48343d1a
embed link to privacy statment in telemetry help text
2018-09-03 13:55:11 -05:00
Isaac Connor
f4c2d8adea
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-09-03 12:29:09 -04:00
Jonathan Lassoff
b3a0b0e731
Update doc and license.
2018-09-03 14:08:59 +00:00
Jonathan Lassoff
a3baf2c371
Update protocol selection handling
2018-09-03 14:08:52 +00:00
Jonathan Lassoff
2074e1ccc3
use strict and remove base class methods
2018-09-03 13:51:33 +00:00
Isaac Connor
b1fe80a0bd
Add JSON/MaybeXS to dependencies, replacing JSON/Any
2018-08-30 18:30:33 -04:00
Andrew Bauer
8f0fb0843a
Add Privacy Statement ( #2194 )
...
* initial implementation of privacy popup
* split the privacy text and run it through translate
* change style of toggle button, validate the form
* fix copy/paste error
* fix typos
* display privacy view inline rather than popup
* display privacy inline if show_privacy flag set
* redirect to console after selection is made
* typo
* css formatting
* update privacy verbiage
* create and load default.php
* fix typos
* fix erroneous copy/paste
2018-08-30 13:25:02 -04:00
Jonathan Lassoff
c605769fc9
Add Control plugin for PTZ cameras supporting the PSIA IP Media Device API
2018-08-28 15:28:52 +00:00
Isaac Connor
1fa78c5aa8
Fix up licensing and copyright
2018-08-17 08:14:13 -04:00
Isaac Connor
15a6eb7e78
Revert "Add Privacy Statement ( #2176 )" ( #2179 )
...
This reverts commit 56f4d768c2
.
2018-08-13 15:33:43 -04:00
Andrew Bauer
56f4d768c2
Add Privacy Statement ( #2176 )
...
* initial implementation of privacy popup
* split the privacy text and run it through translate
* change style of toggle button, validate the form
* fix copy/paste error
* fix typos
* display privacy view inline rather than popup
* display privacy inline if show_privacy flag set
* redirect to console after selection is made
* typo
* css formatting
* update privacy verbiage
* push privacy text to all language files
2018-08-13 15:23:44 -04:00
Isaac Connor
e6d1a9447e
rename TVIP862 to Trendnet and delete TVIP672WI
2018-08-13 11:12:15 -04:00
Isaac Connor
67a3ff392b
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-08-13 11:07:13 -04:00
Isaac Connor
70ba0ad342
Merge https://github.com/michaelbarkdoll/ZoneMinder into trendnet
2018-08-13 11:05:50 -04:00
Andrew Bauer
3dc424282b
Support quoting config variables ( #2175 )
...
* allow handling of quotes in config files
* copy paste error
* surround zm_arptool in quotes
2018-08-11 12:56:16 -04:00
Roman Dissertori
48b91c5544
Bugfix in Control and added new Camera ( #2171 )
...
* fixed control typos
missing word "s" for "Controls" Table for database queries
* added Dericam P2 camera Control
* fixed missing CanReset column
* Update DericamP2.pm
* added some more missing controls
CanSleep, CanWake
* Update DericamP2.pm
* Update DericamP2.pm
* Update DericamP2.pm
* Update DericamP2.pm
* Update DericamP2.pm
* Update DericamP2.pm
* Update DericamP2.pm
* Update zm_create.sql.in
2018-07-28 09:26:02 -04:00
Isaac Connor
7e63b322c1
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2018-07-22 09:58:15 -04:00
Daedilus
26d6b99018
Added new control script for iPhone ip camera software ( #2161 )
...
https://itunes.apple.com/ca/app/ipcamera-high-end-network-camera/id570912928?mt=8
See https://forums.zoneminder.com/viewtopic.php?f=9&t=27386 for details.
2018-07-17 08:09:15 -04:00
Isaac Connor
d3034670a0
Merge branch 'master' into storageareas
2018-07-10 11:03:33 -04:00
Dmitry Smirnov
756369f2d8
JSON::Any --> JSON::MaybeXS ( Closes : #770 ). ( #2151 )
2018-07-10 10:27:03 -04:00
Andrew Bauer
add3682128
fix spelling
2018-07-05 08:00:24 -05:00
Isaac Connor
76abad0a96
escape {} in regexp
2018-07-01 18:19:11 -04:00
Isaac Connor
e98a4b1562
Merge branch 'master' into storageareas
2018-06-25 14:31:00 -04:00
Andrew Bauer
422d2d6dba
set telemetry default to NO
...
This is the first step for GDPR compliance. A future pr will add a prompt which explains what the telemetry pr is for and whether they want to turn it on.
2018-06-22 08:10:48 -05:00
Isaac Connor
3cb5ef6a94
Spacing
2018-06-21 10:00:54 -04:00
Andrew Bauer
3ffd30ffbd
Allow selection of different source column filtering on the console ( #2132 )
2018-06-20 11:12:43 -04:00
Isaac Connor
a594a1b6f1
Merge branch 'master' into storageareas
2018-06-15 09:45:11 -04:00
Isaac Connor
f5026542f8
retest STDERR for terminal output on reinit. Simplify databaseLevel code to clear dbh always when not NOLOG.
2018-06-11 16:05:57 -04:00
Isaac Connor
d5d206f00a
Force disconnect when reinitialize Logging
2018-06-11 15:57:38 -04:00
Isaac Connor
65a5af6f92
remove extra space
2018-06-11 15:49:39 -04:00
Isaac Connor
e32b432fea
Always re-connect to the db on initialize
2018-06-11 14:35:54 -04:00
Isaac Connor
f5f4649886
Fix #2100
2018-06-08 15:14:11 -04:00
Isaac Connor
524c18eb4c
Don't print to STDERR when can't log to db and recheck hasTerm on logging reinit
2018-06-08 15:13:48 -04:00
Isaac Connor
5cdbc85dcc
Slightly more efficient logPrint. Don't create the message string unless it is going to be used
2018-06-08 14:18:38 -04:00
Isaac Connor
e88c73195d
Merge branch 'fix_perl_logging' into storageareas
2018-06-08 09:30:16 -04:00
Isaac Connor
d30d8efaf0
clear stored sth on initialize and re-initialize
2018-06-08 09:17:25 -04:00
Isaac Connor
fc0369b9a4
when detecting a down db connection, need to clear the stored sth as it is no longer valid.
2018-06-08 09:04:31 -04:00
Isaac Connor
be61c50efa
Fix setting Debug option when ZM_LOG_DEBUG_TARGET is empty and fix setting effectiveLevel
2018-06-07 17:25:02 -04:00
Isaac Connor
627ee8aeb3
close syslog in order to not leak ram
2018-06-04 14:59:42 -04:00
Isaac Connor
2eb3c8ef6d
use a stored prepared sth instead of re-preparing it
2018-05-31 10:24:54 -04:00
Isaac Connor
13e11a1e7f
Fix potention div vy zero
2018-05-22 15:52:12 -04:00
Isaac Connor
4bbd8d6ab9
Use zmDbConnect in Database instead of duplicating all the connect code
2018-05-12 14:36:38 -07:00
Isaac Connor
5071fd1ba1
Add mysql_auto_reconnect and force autocommit on
2018-05-12 14:35:43 -07:00
Isaac Connor
1fed8f3428
finish handling a change of Realm. Actually makes it unneccessary to specify the Realm in ControlDevice
2018-05-11 13:14:54 -04:00
Isaac Connor
16e63f81df
fully specify ZoneMinder::Database::ZmDbConnect
2018-05-11 12:42:56 -04:00
Isaac
84c94efaa8
Move redunddant close methods into parent. Use Fatal instead of croak. Croak is not defined so it causes an infinite loop
2018-05-04 02:26:25 +02:00
Isaac Connor
769d4a8693
DB connect can die, so put it in an eval
2018-05-03 09:50:54 -07:00
Isaac Connor
62f6e4a78a
Cleanup lock_and_load add some debug
2018-05-03 09:30:44 -07:00
Isaac Connor
095f4614da
don't move event if there are no files. Add some more debug
2018-05-03 09:30:06 -07:00
Isaac Connor
a1fb944afe
google code style and increase the logging level when reporting that the ControlDevice is wrong.
2018-05-02 11:45:52 -04:00
Isaac Connor
f4b6bde3c2
Put print to STDERR before logging to db because it is more reliable than db
2018-04-30 13:02:43 -04:00
Isaac Connor
8e5ee94420
If we fail to connect, the dbh->trace will crash
2018-04-30 13:02:13 -04:00
Isaac Connor
3f05d46012
Merge zmdc.pl fixes. We can now handle database disconnects gracefully.
2018-04-30 07:09:23 -07:00
Isaac Connor
348468a98d
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-04-26 22:09:48 -04:00
Isaac Connor
8a80cf686b
Merge branch 'master' into storageareas
2018-04-26 21:58:34 -04:00
Andrew Bauer
86b2f6a12e
New Monitor Type - Website ( #2065 )
...
* implement website monitor
* don't check certain fields when using website monitor
* continue to fix javascript errors for website monitors
* check $monitor, not $new_monitor here
* add website monitor documentation
was somehow left out of the initial commit
* fix corruption of functions.php
* add missing comma
* remove errors by testing for existence of key. If it's a new monitor, then none of the keys will be valid
* If the monitor type is WebSite, then default Status to Running.
* put back start function that got lost in merge. Don't start StreamCmd's if it's a WebSite
* Add midding comma
* Hide unrelated tabs when type is WebSite. Put back input fields for Type=WebSite
* Don't show control or any of the status fields for WebSite type monitors
* add some parenthesis to ensure order of operations, seems to fix fps and status fields not being shown for regular monitors
2018-04-26 17:18:36 -04:00
Isaac Connor
00e82fb751
Implement MonitoServerId,StorageServerId,FilterServerID in Filters
2018-04-25 13:05:19 -07:00
Isaac Connor
cc77561826
fix last_event being uint64
2018-04-24 11:40:38 -04:00
Isaac Connor
5a93458441
add StartTime to Filters
2018-04-20 15:22:12 -04:00
Isaac Connor
477e96a4a6
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-04-19 07:46:28 -07:00
Isaac Connor
d9a035a45d
Remove commit that is unneccesary
2018-04-19 07:38:39 -07:00
Isaac Connor
696b17e92e
include path to where we are not deleting from in teh debug output
2018-04-19 07:37:11 -07:00
Isaac Connor
c7f672fabd
SIGNAL_CHECK_POINTS is now a per-monitor setting
2018-04-19 09:59:10 -04:00
Isaac Connor
c27aa5efea
Need to actually export CpuLoad
2018-04-18 21:44:37 -04:00
Isaac Connor
fcaac016b5
Merge ../ZoneMinder.connortechnology
2018-04-18 21:12:14 -04:00
Isaac Connor
70b8188cc1
make MoveTo more efficient by bailing early if it has already been moved. Also add a check for it's Old storage area changing.
2018-04-18 13:48:01 -07:00
Isaac Connor
00b7ae9006
put in missing my
2018-04-18 10:07:50 -04:00
Isaac Connor
1040afbda4
change message about not deleting files for speed
2018-04-18 09:27:11 -04:00
Isaac Connor
bfe82e297a
Default an empty Storage to doing Deletes
2018-04-18 09:26:36 -04:00
Andrew Bauer
04cb1f9300
use ZoneMinder::Server::CpuLoad rather than Sys:CpuLoad ( #2080 )
2018-04-17 21:09:41 -04:00
Isaac Connor
05fdc51be0
Fix Sql caching
2018-04-14 15:05:05 -04:00
Isaac Connor
925f640118
Fix Filters using a cached SQL
2018-04-14 11:09:01 -04:00
Isaac Connor
f9f78e9aa3
Convert event_id to a 64bit unsigned int
2018-04-12 13:40:11 -07:00
Isaac Connor
9fde052d39
merge
2018-04-03 14:41:32 -07:00
Isaac Connor
793f630ee0
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-04-02 10:43:07 -07:00
Pliable Pixels
95eb1d3045
merged master storage areas, resolved conflicts
2018-03-29 08:51:35 -04:00
Pliable Pixels
990d60926e
#92 new key
2018-03-29 08:47:55 -04:00
Isaac Connor
31963dcd16
say how big the file was
2018-03-28 13:41:16 -07:00
Isaac Connor
9d5dcd7b0c
return to indicate success of load
2018-03-28 08:56:03 -07:00
Isaac Connor
3e7bc46bf9
Add Amazon S3 file deletion. Add bandwidth use in file move.
2018-03-28 08:21:57 -07:00
Isaac Connor
27736fb5d9
Merge ../ZoneMinder.master into storageareas
2018-03-15 11:04:41 -04:00
Isaac Connor
79b10b0166
Use Event.Width and Event.Height instead of Monitor.Width and Monitor.Height when generating video of an event.
2018-03-14 10:09:31 -04:00
Pliable Pixels
704ccaee73
2059 alarm cause ( #2060 )
...
* added alarm_cause as a test
* initial attempt to integrate with notes
* testing sizeof
* add zone labels
* fixed typo
* fixed typo
* comments and formatting
* Downgraded invalid attribute to error
* Removed Error downgrade. Instead do a undefined check on field params
* Added help text
2018-03-12 19:38:12 -04:00
Isaac Connor
fa01dbf6af
use parent's new and AUTOLOAD methods
2018-03-09 09:19:26 -05:00
Andy Bauer
b41363fd60
Merge branch 'patch-3' of https://github.com/habibapp1365/zoneminder into habibapp1365-patch-3
2018-03-06 11:37:49 -06:00
habibapp1365
50a63c7899
Create DCS3415.pm
...
D-Link DCS-3415 IP Control Protocol
2018-03-06 11:31:39 +03:30
Isaac Connor
3aa31fd524
Merge branch 'master' into storageareas
2018-02-23 10:23:35 -05:00
Isaac Connor
3eaf95c607
handle Storage reload request
2018-02-21 14:09:51 -05:00
Isaac Connor
449ac87af1
force reload on Storage in Event object when moving
2018-02-21 14:09:12 -05:00
Isaac Connor
af560b8291
SIG{TERM} can be empty
2018-02-19 15:14:36 -05:00
Isaac Connor
6883350e47
spacing/quotes/google code style. Always close and reopen logfile, as the filename may have changed
2018-02-15 10:00:13 -05:00
Isaac Connor
956f9ee193
if there is a custom term handler in place, call it when Fatal
2018-02-11 14:17:44 -05:00
Isaac
208d563e11
fix Event => __git_main[0]
2018-02-09 02:09:00 +01:00
Isaac Connor
069d53a9a0
Add the object debug when path to event does not exist in DiskSpace
2018-02-07 08:02:37 -05:00
flashoftheblades
630dde26d1
Add files via upload
2018-02-05 18:52:05 -05:00
Isaac Connor
0287868f5e
include the status when error runCommand
2018-02-02 11:06:47 -05:00
Isaac Connor
87ef17dddc
errors running a command should NOT exit!
2018-02-02 11:05:56 -05:00
Isaac Connor
c96f47886c
Fix discover not picking up a 1.2 response if we already have a 1.1
2018-01-31 16:56:46 -05:00
Isaac Connor
0bd1ee5992
Merge branch 'master' into m
2018-01-25 08:43:31 -05:00
Isaac Connor
e4c900a868
Use a LEFT JOIN on Storage WHEN Running Filters
2018-01-24 12:34:06 -05:00
Isaac Connor
1800c6fcf0
Add locking around Event deletion
2018-01-24 12:16:34 -05:00
Isaac Connor
cf4ac74d02
If failed to delete from Frames or Stats, return instead of deleting the event.
2018-01-24 10:45:42 -05:00
Simpler1
ce19c65cc9
Ipcc ( #2040 )
...
* fix(ipcc): Invert up/down to work properly
* fix(ipcc): Change the initial values for ipcc camera
2018-01-22 15:33:11 -05:00
Isaac Connor
37ff7c3779
Add finding by Id to Event
2018-01-22 15:26:01 -05:00
Isaac Connor
2068a5c684
Add object caching
2018-01-22 15:25:51 -05:00
Isaac Connor
b317748796
Add Server loading
2018-01-22 11:09:49 -05:00
Isaac Connor
493a2386c4
Only load Time from StartTime if it has a value. Parse Path to get LInkPath if no Time.
2018-01-22 11:09:35 -05:00
Isaac
c5332a255b
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-01-21 21:11:28 +01:00
Isaac
fedd67a7f6
add to_string
2018-01-21 21:11:05 +01:00
Isaac Connor
43d72decac
Turn off extra debugging
2018-01-19 18:24:59 -05:00
Isaac Connor
dfce773341
We should return the value of DiskSpace
2018-01-19 13:32:28 -05:00
Isaac
62704601ca
We should return the value of DIskSpace
2018-01-19 19:22:43 +01:00
Isaac Connor
9fb1074875
add auto-scheme detection from path. Fix de-tainting in delete_files
2018-01-19 11:39:31 -05:00
Isaac Connor
5472a1a012
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-01-18 11:40:37 -05:00
Isaac Connor
715adb5acb
add locking to Event moving and diskspace updating.
2018-01-18 11:38:08 -05:00
Isaac Connor
eb92a1ed8b
merge updates that fix Event moving
2018-01-17 12:59:34 -08:00
Isaac Connor
426976ddb7
cleanup return code
2018-01-16 14:04:44 -05:00
Isaac Connor
aaa6c5cccb
Only delete files if no error
2018-01-16 14:01:26 -05:00
Isaac Connor
1d6c9d6edd
Empty Storage Name should not be Fatal
2018-01-13 10:14:11 -05:00
Isaac
12d310a9cb
Cleanup
2018-01-11 22:53:34 +01:00
Isaac Connor
5792021ee3
Merge branch 'storageareas' into fugro
2018-01-10 15:08:28 -05:00
Isaac Connor
f14859d7d0
Add ZM_STATS_UPDATE_INTERVAL
2018-01-10 13:20:24 -05:00
Isaac Connor
e28b6c8b7c
When server is NULL, don't escape the NULL
2018-01-09 07:29:32 -08:00
Isaac Connor
4e24e3647e
Also join the Storage table, and use it for ServerId instead of Monitors table.
2018-01-03 07:20:20 -08:00
Isaac Connor
485741b6f7
treat File exists as a non-error
2018-01-02 12:44:47 -08:00
Isaac Connor
867f2a9166
simplify deleting event files. The old way was too intensive.
2018-01-02 09:15:50 -08:00
Isaac Connor
148e21d707
fugro
2017-12-21 21:46:21 -05:00
Isaac Connor
f036e95793
fix Moving when Medium Scheme
2017-12-21 16:53:22 -08:00
Isaac Connor
2922a86d23
fixes to new Storage Schemes code
2017-12-19 11:01:03 -05:00
Isaac Connor
dcfae11fc7
fix typos
2017-12-18 13:16:54 -05:00
Isaac Connor
d312482a2b
add StorageScheme to Storage and Events. Deprecate ZM_USE_DEEP_STORAGE
2017-12-18 12:52:26 -05:00
Isaac Connor
f64d65e6d7
Make db errors not fatal when deleting an event
2017-12-12 10:55:09 -05:00
Isaac Connor
e7a43b2618
fix, don't set the storage path to NULL
2017-12-06 10:11:59 -08:00
Isaac Connor
073b055b4c
fix Event Moving
2017-12-05 10:21:43 -08:00
Isaac Connor
b1a887dbd8
fixes to move Event
2017-12-05 10:02:21 -08:00
Isaac Connor
82bed8f3fa
actually delete the old files when we move an event
2017-12-05 08:43:13 -08:00
Isaac Connor
203fe79391
cleanup debug
2017-12-04 11:14:55 -05:00
Isaac Connor
1ccd344bf5
implement Storage Area move
2017-12-04 11:05:50 -05:00
digital-gnome
0a995aea78
Add navbar refresh to all pages that use it
2017-11-30 16:33:46 -05:00
Isaac Connor
c2ff010d27
Support NULL in date/time values
2017-11-27 10:04:08 -08:00
Isaac Connor
489d3ba6ed
Merge ../ZoneMinder.master into storageareas
2017-11-21 12:23:17 -05:00
Ognyan Bankov
ded6b1864a
2006 support floureon 1080p 18x 30x ( #2007 )
...
* perl control script for Fluoreon 1080p
* DB update for Floureon cameras support
2017-11-18 19:02:23 -05:00
Isaac Connor
09a715a99f
prevent a warning
2017-11-18 09:41:37 -05:00
APHW2 MFGENG
2ffa79172a
Only load Name,Value when loading config because that's all we use
2017-11-06 08:36:53 -08:00
Isaac Connor
31b756bd53
add missing tests for StartDateTime etc
2017-11-03 07:18:30 -04:00
Isaac Connor
cb01b96dc0
fixes
2017-11-01 12:01:11 -07:00
Isaac Connor
ae8bfadcf7
use static logging method
2017-10-27 21:13:14 -07:00
Isaac Connor
b3d65729da
apache style logging function take a logging object
2017-10-27 21:13:01 -07:00
Isaac Connor
2003798e64
copy in start and end transaction
2017-10-27 21:06:11 -07:00
Isaac Connor
2d6998ad25
fix debug_all
2017-10-27 20:54:54 -07:00
Isaac Connor
2d8a4794de
add save, set, transform, and some globals pointing to dbh and log
2017-10-27 20:54:29 -07:00
Isaac Connor
8b4468caed
add apache log style aliases
2017-10-27 20:54:19 -07:00
Isaac Connor
663cc6df87
improve logging of zmfilter
2017-10-27 09:09:12 -07:00
Isaac Connor
82fbec697f
add IS and IS NOT as filter operators so that we can do IS NULL and IS NOT NULL because = NULL and !=NULL are not valid
2017-10-27 08:37:53 -07:00
Isaac Connor
e27b95c820
make zmfilter update DiskSPace. ALso rename DiskUsage in Event to DiskSpace
2017-10-27 08:05:35 -07:00
Isaac Connor
653d213d62
Add EndTime and DiskSpace to Filters
2017-10-25 11:11:19 -07:00
Isaac Connor
6c03ae32c2
add code to update the statuses in the Server record every second. This code also reduces the timeout from .1 seconds to 1 second. Should reduce load by zmdc on low power devices. I see no reason to poll that heavily...
2017-10-24 12:31:23 -07:00
Isaac Connor
7f565e318f
use the untaint version otherwise we die with error 9
2017-10-13 08:59:32 -04:00
Isaac Connor
5c7203f2bb
Fix File=> File::Find
2017-10-12 11:42:49 -07:00
Isaac Connor
e6c0add17e
add ZM_BANDWIDTH_DEFAULT
2017-10-12 12:09:05 -04:00
Isaac Connor
7f50a13074
add Event disk space recalc to zmaudit
2017-10-10 12:11:59 -07:00
Michael Barkdoll
707444c39e
Add files via upload
2017-10-09 09:44:45 -05:00
Isaac Connor
09242d72b3
implement alternate ports for streaming
2017-10-05 16:05:41 -04:00
Isaac Connor
ad1808d43b
warn when path doesn't exist in event::age
2017-10-03 13:25:05 -04:00
Isaac Connor
11b29bf1ec
Fixup ONVIF module, making it actually usable
2017-08-25 11:16:37 -04:00
Isaac Connor
676c4b7ddc
Merge branch 'master' into storageareas
2017-08-22 09:52:14 -04:00
Isaac Connor
40cc13a903
fix whitespace
2017-08-22 09:34:02 -04:00
Andrew Bauer
ac5d1738ea
allow changing of the timestamp char code delimeter ( #1972 )
2017-08-21 11:27:11 -04:00
Isaac Connor
49464d381a
Merge branch 'master' into storageareas
2017-08-14 10:44:40 -04:00
ralimi
ecb7df0e8b
Support SSL for mysql connections ( #1965 )
...
* Fix install location for config files when building to alternate directory.
With the previous code, we ended up with a directory structure like the following:
$ find /etc/zm/conf.d/
/etc/zm/conf.d/
/etc/zm/conf.d/01-system-paths.conf
/etc/zm/conf.d/conf.d
/etc/zm/conf.d/conf.d/README
/etc/zm/conf.d/conf.d/02-multiserver.conf
* Omitted README file that should have appeared in /etc/zm/conf.d
* Fix location for configs when building to alternate directory.
* Fix works, but this should go on a branch instead.
* Fix works, but this should go on a branch instead.
* Fix location for configs when building to alternate directory.
With the previous code, we ended up with a directory structure like the following:
$ find /etc/zm/conf.d/
/etc/zm/conf.d/
/etc/zm/conf.d/01-system-paths.conf
/etc/zm/conf.d/conf.d
/etc/zm/conf.d/conf.d/README
/etc/zm/conf.d/conf.d/02-multiserver.conf
* Remove double quotes. This is a list of paths.
* Allow SSL database connection to be secured with SSL.
* Fix incorrect variable name
* Fix PHP syntax errors
* SSL connection parameters must also be passed in API.
* Revert fixes to build files; they should not be in this branch.
2017-08-14 10:30:42 -04:00
Isaac Connor
cfbfc0dd44
Merge branch 'master' into storageareas
2017-07-21 11:04:32 -04:00
Isaac Connor
ee7d714d59
refuse and log attempt to delete an event without full info
2017-07-21 10:54:09 -04:00
Andrew Bauer
89bcfc4e28
fix incorrect gpl license text mailing address
2017-07-14 10:39:50 -05:00
Isaac Connor
b3984ea2da
Merge branch 'master' into storageareas
2017-07-14 10:38:20 -04:00
Martin Goodwell
3789dcb5de
Introducing Maginon Supra IPC camera Controls and script ( #1947 )
...
* Added Maginon Supra IPC to Controls
* Adding support for Maginon Supra IPC camera
2017-07-13 11:10:20 -04:00
Isaac Connor
771d385257
Merge branch 'logger_fix' into storageareas
2017-07-05 15:28:44 -04:00
Isaac Connor
2cab6baf2c
add some comments and one change that may fix effectiveLevel use
2017-07-05 15:25:01 -04:00
Isaac Connor
92c25dc58c
Merge branch 'master' into storageareas
2017-06-23 10:43:46 -04:00
Isaac Connor
5d63bc47cc
I believe level should be effectiveLevel here
2017-06-23 10:22:37 -04:00
Isaac Connor
12c3bde8b0
remove debug
2017-06-23 10:04:50 -04:00
Isaac Connor
3a00656c3f
WHen can't open file log, turn on terminal logging so that the message goes somewhere useful.
2017-06-23 09:58:19 -04:00
Isaac Connor
2460e1acd9
fix whitspace
2017-06-23 09:58:01 -04:00
Isaac Connor
be8be3b0fd
Put back Lost Storageareas code
2017-06-19 13:40:32 -04:00
Isaac Connor
085d239a6e
Merge branch 'master' into storageareas
2017-06-13 18:02:28 -04:00
Andrew Bauer
bacf65ae9a
Migrate values from Options -> Paths to zm.conf ( #1908 )
...
* initial commit to migrate contents of Options->Paths to zm.conf
* remove paths items from configdata.pm
* remove paths tab from options
* update deb packaging scripts with new cmake vars
* remove extraneous file
* save custom paths variables to config file before dB is freshened
* don't check configs if the dB version is >= 1.31.0
2017-06-12 21:39:37 -04:00
Isaac Connor
371b86300a
Merge branch 'master' into storageareas
2017-06-08 14:23:40 -04:00
Andrew Bauer
2bc6f1627e
Add support for conf.d subfolder ( #1902 )
...
* cmake changes to support conf.d
* php changes to support conf.d
* perl changes to support conf.d
* C changes to support conf.d
* add conf.d support to rpmspecfile
* fix typo
* specify ZM_CONFIG_SUBDIR in relevant target distros
* put back my config_file perl definition
* remove quotes from ZM macros
* fix snprintf
* add README to conf.d folder
* adjust rpm specfile
* remove custom permissions from README in rpmspecfile
* modify rpm README documentation to reflect conf.d support
* set ZM_CONFIG_SUBDIR in debian rules file
2017-06-05 16:39:19 -04:00
Isaac Connor
451714a403
Merge branch 'master' into storageareas
2017-06-04 21:42:56 -04:00