18b327b4ac
Turn off massive debugging
2018-11-06 09:55:53 -05:00
e1a5940254
Merge branch 'zmrecover' into storageareas
2018-11-05 16:53:01 -05:00
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
4b24bf4e36
merge from storageareas, fully specify Module for zmDbDisconnect as we havn't 'used' it
2018-11-02 11:48:35 -04:00
372c6b7f69
explicitly call ZoneMinder::Database::zmDbDisconnect
2018-10-17 20:57:24 -04:00
7149576a7c
Merge branch 'smarter_packetqueue' into storageareas
2018-10-15 10:59:50 -04:00
7ffc5ab266
Merge branch 'master' into control_plugin_psia
2018-10-11 09:32:06 -05:00
1958351a13
Merge branch 'master' into storageareas
2018-10-09 10:24:24 -04:00
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
33bd30fbbd
Merge branch 'master' into storageareas
2018-09-28 13:40:18 -04:00
d45406bce7
ode style and some more debug
2018-09-28 11:50:34 -04:00
e6f366c5cb
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2018-09-28 09:48:37 -04:00
5fd1034b0b
Add ServerId to perl Logging to DB
2018-09-25 13:53:50 -04:00
af69dab9c5
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2018-09-22 14:58:28 -04:00
6aa71dfc11
Fix calculation of LinkPath, as it was using RelativePath instead of Path
2018-09-21 10:31:11 -04:00
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
f2a117c85b
fix undefined $event
2018-09-14 11:06:08 -04:00
ca3fd5ddf8
get rid of deleteEventFiles function. People should use the object method
2018-09-14 10:08:35 -04:00
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
63bed3af10
replace all uses of getEventPath with object function event->Path(). Remove getEventPath
2018-09-14 09:23:09 -04:00
7bcf9d59e1
Use named regex capture groups.
2018-09-12 12:55:31 +00:00
684f48979a
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-09-11 14:30:19 -04:00
9e8a876101
Fix finding Storage by ServerId
2018-09-09 13:28:11 -04:00
b7aa11f109
Fix infinite loop reconnecting to db in Logging
2018-09-07 16:30:24 -04:00
def72b8e66
tidy up license
2018-09-07 16:29:59 -04:00
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
c34f899d31
eliminate warning when no Storage area is set.
2018-09-04 13:57:35 -04:00
13558b2c12
convert existing http urls in help text to markdown
2018-09-04 07:39:46 -05:00
4deaa49048
Remove license from top of file
2018-09-04 10:48:28 +00:00
ce48343d1a
embed link to privacy statment in telemetry help text
2018-09-03 13:55:11 -05:00
f4c2d8adea
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-09-03 12:29:09 -04:00
b3a0b0e731
Update doc and license.
2018-09-03 14:08:59 +00:00
a3baf2c371
Update protocol selection handling
2018-09-03 14:08:52 +00:00
2074e1ccc3
use strict and remove base class methods
2018-09-03 13:51:33 +00:00
b1fe80a0bd
Add JSON/MaybeXS to dependencies, replacing JSON/Any
2018-08-30 18:30:33 -04:00
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
c605769fc9
Add Control plugin for PTZ cameras supporting the PSIA IP Media Device API
2018-08-28 15:28:52 +00:00
1fa78c5aa8
Fix up licensing and copyright
2018-08-17 08:14:13 -04:00
15a6eb7e78
Revert "Add Privacy Statement ( #2176 )" ( #2179 )
...
This reverts commit 56f4d768c2
2018-08-13 15:33:43 -04:00
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
e6d1a9447e
rename TVIP862 to Trendnet and delete TVIP672WI
2018-08-13 11:12:15 -04:00
67a3ff392b
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-08-13 11:07:13 -04:00
70ba0ad342
Merge https://github.com/michaelbarkdoll/ZoneMinder into trendnet
2018-08-13 11:05:50 -04:00
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
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
7e63b322c1
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2018-07-22 09:58:15 -04:00
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
d3034670a0
Merge branch 'master' into storageareas
2018-07-10 11:03:33 -04:00
756369f2d8
JSON::Any --> JSON::MaybeXS ( Closes : #770 ). ( #2151 )
2018-07-10 10:27:03 -04:00
add3682128
fix spelling
2018-07-05 08:00:24 -05:00
76abad0a96
escape {} in regexp
2018-07-01 18:19:11 -04:00
e98a4b1562
Merge branch 'master' into storageareas
2018-06-25 14:31:00 -04:00
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
3cb5ef6a94
Spacing
2018-06-21 10:00:54 -04:00
3ffd30ffbd
Allow selection of different source column filtering on the console ( #2132 )
2018-06-20 11:12:43 -04:00
a594a1b6f1
Merge branch 'master' into storageareas
2018-06-15 09:45:11 -04:00
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
d5d206f00a
Force disconnect when reinitialize Logging
2018-06-11 15:57:38 -04:00
65a5af6f92
remove extra space
2018-06-11 15:49:39 -04:00
e32b432fea
Always re-connect to the db on initialize
2018-06-11 14:35:54 -04:00
f5f4649886
Fix #2100
2018-06-08 15:14:11 -04:00
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
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
e88c73195d
Merge branch 'fix_perl_logging' into storageareas
2018-06-08 09:30:16 -04:00
d30d8efaf0
clear stored sth on initialize and re-initialize
2018-06-08 09:17:25 -04:00
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
be61c50efa
Fix setting Debug option when ZM_LOG_DEBUG_TARGET is empty and fix setting effectiveLevel
2018-06-07 17:25:02 -04:00
627ee8aeb3
close syslog in order to not leak ram
2018-06-04 14:59:42 -04:00
2eb3c8ef6d
use a stored prepared sth instead of re-preparing it
2018-05-31 10:24:54 -04:00
13e11a1e7f
Fix potention div vy zero
2018-05-22 15:52:12 -04:00
4bbd8d6ab9
Use zmDbConnect in Database instead of duplicating all the connect code
2018-05-12 14:36:38 -07:00
5071fd1ba1
Add mysql_auto_reconnect and force autocommit on
2018-05-12 14:35:43 -07:00
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
16e63f81df
fully specify ZoneMinder::Database::ZmDbConnect
2018-05-11 12:42:56 -04:00
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
769d4a8693
DB connect can die, so put it in an eval
2018-05-03 09:50:54 -07:00
62f6e4a78a
Cleanup lock_and_load add some debug
2018-05-03 09:30:44 -07:00
095f4614da
don't move event if there are no files. Add some more debug
2018-05-03 09:30:06 -07:00
a1fb944afe
google code style and increase the logging level when reporting that the ControlDevice is wrong.
2018-05-02 11:45:52 -04:00
f4b6bde3c2
Put print to STDERR before logging to db because it is more reliable than db
2018-04-30 13:02:43 -04:00
8e5ee94420
If we fail to connect, the dbh->trace will crash
2018-04-30 13:02:13 -04:00
3f05d46012
Merge zmdc.pl fixes. We can now handle database disconnects gracefully.
2018-04-30 07:09:23 -07:00
348468a98d
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-04-26 22:09:48 -04:00
8a80cf686b
Merge branch 'master' into storageareas
2018-04-26 21:58:34 -04:00
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
00e82fb751
Implement MonitoServerId,StorageServerId,FilterServerID in Filters
2018-04-25 13:05:19 -07:00
cc77561826
fix last_event being uint64
2018-04-24 11:40:38 -04:00
5a93458441
add StartTime to Filters
2018-04-20 15:22:12 -04:00
477e96a4a6
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-04-19 07:46:28 -07:00
d9a035a45d
Remove commit that is unneccesary
2018-04-19 07:38:39 -07:00
696b17e92e
include path to where we are not deleting from in teh debug output
2018-04-19 07:37:11 -07:00
c7f672fabd
SIGNAL_CHECK_POINTS is now a per-monitor setting
2018-04-19 09:59:10 -04:00
c27aa5efea
Need to actually export CpuLoad
2018-04-18 21:44:37 -04:00
fcaac016b5
Merge ../ZoneMinder.connortechnology
2018-04-18 21:12:14 -04:00
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
00b7ae9006
put in missing my
2018-04-18 10:07:50 -04:00
1040afbda4
change message about not deleting files for speed
2018-04-18 09:27:11 -04:00
bfe82e297a
Default an empty Storage to doing Deletes
2018-04-18 09:26:36 -04:00
04cb1f9300
use ZoneMinder::Server::CpuLoad rather than Sys:CpuLoad ( #2080 )
2018-04-17 21:09:41 -04:00
05fdc51be0
Fix Sql caching
2018-04-14 15:05:05 -04:00
Isaac Connor
Andrew Bauer
Isaac Connor
Jonathan Lassoff
Jonathan Lassoff
Andy Bauer
Roman Dissertori
Daedilus
Dmitry Smirnov
Andrew Bauer
Isaac Connor
Isaac