8dd8888975
Php namespace ( #2537 )
...
* experiment with namespaces on the Server class
* experiment with namespaces on the Server class
* Implement the ZM namespace on objects
* Implement the ZM namespace on objects
* Implement the ZM namespace on objects
2019-02-22 09:19:07 -05:00
a9e2011727
Merge branch 'storageareas' into zma_to_thread
2019-02-13 12:24:38 -05:00
555cb4780d
Merge branch 'master' into storageareas
2019-02-10 12:37:45 -05:00
254b7286b4
monitor.php: Escape SignalCheckColour to prevent XSS. Fixes #2451
2019-02-09 16:41:54 -08:00
87d1390fed
Merge branch 'storageareas' into h265
2019-01-16 15:20:17 -05:00
f726666f54
Merge branch 'master' into h265
2019-01-14 12:36:11 -05:00
28dafd5931
Merge branch 'storageareas' into zma_to_thread
2018-12-26 12:02:00 -05:00
c8c34d3f95
Merge branch 'master' into storageareas
2018-12-11 10:21:22 -05:00
e1ecd47bff
Fix missing use of UrlToApi
2018-12-11 09:40:40 -05:00
4272225a17
Merge branch 'master' into h265
2018-11-30 16:42:16 -05:00
af2bb992e9
Merge branch 'server_path_prefix' into storageareas
2018-11-29 14:33:46 -05:00
1c17f334d3
fix missing bits. Implement UrlToIndex in Monitor and fix use of Url(). Implement PathToApi as well
2018-11-29 14:26:30 -05:00
7ad19be0d7
Merge branch 'server_path_prefix' into storageareas
2018-11-23 13:29:01 -05:00
c5f7fb7b18
Merge branch 'master' into server_path_prefix
2018-11-22 10:04:33 -05:00
b16cd7ec84
Merge branch 'h265' into zma_to_thread
2018-11-20 12:38:17 -05:00
e24a308481
Merge branch 'master' into h265
2018-11-14 17:15:37 -05:00
786ca5b22a
implement remove service restart for zma. Use daemonControl instead of saving the monitor when restarting zmc
2018-11-14 13:00:19 -05:00
ec09a71ba0
Include defaults for all the missing Monitor Columns
2018-11-07 13:18:53 -05:00
a8329465fb
Merge branch 'master' into h265
2018-10-22 10:30:01 -04:00
5ab1126260
Merge branch 'storageareas' into zma_to_thread
2018-10-20 17:31:14 -04:00
37065d15ac
fix url to api in monitor restart.
2018-10-16 09:47:24 -04:00
c4c8a728f2
Handle no controls found more gracefully
2018-10-10 19:04:00 -04:00
52b1439d51
fix the lack of /zm/index.php in url in Server->Url() and multiport
2018-10-08 09:55:47 -04:00
503b40cb62
Need to cache the object not the row
2018-09-20 10:07:15 -04:00
7f98277571
Merge updated Monitor.php that does caching
2018-09-15 09:52:08 -04:00
b5b71edbf6
Make a Url function in the Monitor object to use the Server->Url + Port. Default to port used in current url. Fixes problems with using something other than port 80
2018-09-14 14:26:45 -04:00
03f769eacc
Rough in codec specification for Events
2018-09-10 12:22:55 -04:00
55dcb161ae
find should always return an array
2018-09-09 13:59:10 -04:00
dfdac2ed70
make find and find_one functions consistent across Objects
2018-09-07 16:31:11 -04:00
6e5472d305
Merge branch 'master' into server_path_prefix
2018-08-22 12:57:16 -04:00
979b31ffc3
Merge branch 'storageareas' into zma_to_thread
2018-08-11 10:08:30 -04:00
363e1dda97
Add some more Monitor defaults, mainly Refresh which gets called in watch.js.php
2018-07-31 10:15:26 -04:00
661876b998
Use Server->Url() more,, moving the logic into Server->Url()
2018-07-09 12:09:29 -04:00
d271d8bf1d
Fix my botched change to generateAuthHash
2018-06-25 14:50:54 -04:00
3ffd30ffbd
Allow selection of different source column filtering on the console ( #2132 )
2018-06-20 11:12:43 -04:00
73555edfdc
Add Error message when a monitor has no server assigned in a multi-server setup
2018-06-11 16:34:23 -04:00
af3ce3660f
Only unlink if file exists, removing warning. Always return a Storage object in Monitor->Storage() fixes Monitor Delete.
2018-05-24 09:54:45 -04:00
4454ca0072
Merge branch 'storageareas' into zma_to_thread
2018-05-20 10:39:14 -04:00
be424f46f0
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-05-18 12:07:22 -04:00
49d75ce039
handle Width and Height not being in ->{} and returnining defaults. Include Path in Source
2018-05-15 10:45:47 -07:00
94377a4652
Merge branch 'storageareas' into zma_to_thread
2018-05-05 12:57:50 -04:00
5772ff9161
return default values for Width and Height
2018-05-05 12:49:00 -04:00
f6139d33ed
Merge branch 'storageareas' into zma_to_thread
2018-05-05 12:25:11 -04:00
3fd953a4eb
Move code to generate Source from console into Monitor Object
2018-05-04 06:46:46 -07:00
2a81877664
spacing
2018-04-25 09:31:40 -04:00
80803a164c
in set(), check to see if there is a method and if there is call it to set the value. Implement using GroupIds to set the GroupIds value. If the new value is a scalar, then turn it into an array.
2018-04-25 09:27:43 -04:00
20f6985dff
implement capturing bandwidth
2018-04-24 14:11:27 -04:00
fd1c69d48a
switch to uint64_t for event_id because long long can actually be 128 bit
2018-04-17 13:51:20 -04:00
c7deb91319
Merge branch 'zma_to_thread' of github.com:ConnorTechnology/ZoneMinder into zma_to_thread
2018-04-14 14:58:25 -04:00
cd3046abb3
Merge branch 'storageareas' into zma_to_thread
2018-04-14 11:03:08 -04:00
47b871ed9f
implement MIN_STREAMING_PORT for Multi-server
2018-04-11 13:50:35 -07:00
03ff2fcde4
add caching and find_one to Storage and Groups
2018-04-10 13:05:37 -07:00
6faf9b5c35
fix including auth on remote restart
2018-04-05 11:24:47 -04:00
1033755dc8
add missing {
2018-04-04 16:46:38 -04:00
6ebedff2e1
If using MIN_STREAMING_PORT then use ['SERVER_NAME'] instead of HTTP_HOST because HTTP_HOST may contain a custom port
2018-04-04 16:45:25 -04:00
914de097db
Fix typo
2018-03-23 13:34:46 -07:00
61d438511f
Fixes to delete
2018-03-21 11:32:54 -07:00
eade5316b9
Move Monitor delete logic to the object. Don't fixSequences when deleting monitors
2018-03-20 12:18:07 -07:00
03d3f5e665
Merge branch 'storageareas' into zma_to_thread
2018-03-03 13:28:01 -08:00
9a157bf4ca
add Type, MaxFPS, AlarmMaxFPS to field defaults
2018-03-01 19:23:27 -08:00
c443168389
split out codec and encoder, allowing one to specify which encoder to use
2018-02-28 07:17:16 -08:00
67cc7dcf7c
Add a GroupIds function to return the groups
2018-02-27 11:20:41 -08:00
3ce46d3fed
Merge branch 'storageareas' into zma_to_thread
2018-01-29 15:55:05 -05:00
67b365948e
Merge branch 'storageareas' into zma_to_thread
...
Conflicts:
src/zm_ffmpeg_camera.cpp
src/zm_monitor.cpp
web/includes/Monitor.php
web/skins/classic/views/js/add_monitors.js
web/skins/classic/views/js/console.js
2018-01-29 15:53:26 -05:00
e638817cb9
Check for ServerId exists in MonitorObject
2018-01-29 10:40:50 -08:00
73d84c6b08
fix typo
2018-01-29 07:53:48 -08:00
8c4a786114
Move status fields out of the object fields
2018-01-29 10:27:46 -05:00
f0d4cab24a
Merge branch 'storageareas' into zma_to_thread
...
Conflicts:
web/ajax/add_monitors.php
2018-01-21 11:13:06 -05:00
2720b254ff
Add Triggers to Monitors field to quiet error
2018-01-19 08:16:41 -08:00
834dfbfe0c
Merge branch 'storageareas' into zma_to_thread
2018-01-01 16:38:54 -05:00
9dfad4886d
fix saving Monitors
2017-12-22 16:13:00 +01:00
99968dfa2a
Merge branch 'storageareas' into zma_to_thread
2017-11-27 11:28:36 -05:00
4b92a788f7
fix filter execute
2017-11-24 15:37:50 -05:00
8e494ef431
Merge branch 'storageareas' into zma_to_thread
2017-11-23 08:40:49 -05:00
095e1ecadb
remove extra ), add AnalysisFPS and CaptureFPS
2017-11-21 23:58:13 -05:00
e617ffca2d
can't use BASE_URL since it will be empty. Have to construct a full URL when using MIN_STREAMING_PORT
2017-11-21 21:00:27 -05:00
bb6e6c18eb
add defaults for CaptureFPS and AnalysisFPS
2017-11-14 13:17:50 -08:00
bafdf1fdfc
add codecs and containers
2017-11-13 21:41:57 -05:00
57a53f6fdd
spacing and fixes
2017-11-09 15:03:23 -05:00
bef7c0ed94
Only start a monitor if it has a Function
2017-11-05 11:54:00 -05:00
bc150574c7
wip import
2017-10-26 18:56:10 -07:00
ced5015a83
move zmcControl and zmaControl to the Monitor Object
2017-10-23 17:00:59 -07:00
09242d72b3
implement alternate ports for streaming
2017-10-05 16:05:41 -04:00
371b86300a
Merge branch 'master' into storageareas
2017-06-08 14:23:40 -04:00
2c1f576da4
Don't need to check for values in args, beacuse we set one above
2017-06-08 14:01:44 -04:00
ad4264dad7
spacing
2017-06-05 15:21:27 -04:00
ac8b09e89c
merge some trivial updates from storageareas
2017-05-16 14:14:07 -04:00
c4caa9a631
convert arguments from an array of strong to a hash and use http_build_query
2017-02-27 21:48:08 -05:00
091459004c
ServerId can be 0
2016-09-21 10:30:31 -04:00
a28e7d8df8
fix typo
2016-08-30 14:24:51 -04:00
6204ed8dd4
correct incorrect use of isset instead of array_key_exists
2016-08-30 13:43:49 -04:00
d6b126fe8c
Add caller and line when an unknown function is called on the Monitor object
2016-08-22 11:28:53 -04:00
c82c872665
add a default NULL value to __construct
2016-08-17 10:31:16 -04:00
f9e7d3ccd8
fix error messages when an empty Monitor is instantiated
2016-08-09 10:43:51 -04:00
791c8fb3d5
add setting of object property
2016-06-24 10:30:56 -04:00
4230bd1bd5
move the control_fields into the class so that it is available.
2016-06-20 12:46:23 -04:00
9c7b22086f
introduce a hash to define the fields and default values of the control table. Primarily this is to prevent method warnings when a monitor is not controllable
2016-06-20 12:41:14 -04:00
0f1a1a6294
log invalid calls to Monitor Object
2016-06-14 12:38:17 -04:00
4b782efd54
Whitespace fixes
2016-05-05 15:30:24 -04:00
868e5a51fa
Rename some of the columns names when laoding Control settings as they conflict with Monitor columns
2016-04-04 16:44:21 -04:00
6816a4c75b
Merge branch 'iconnor_video' into storageareas
2016-04-01 11:35:38 -04:00
c074f6e0bf
Add a set function to take an array of value to set in the Object
2016-04-01 10:34:40 -04:00
45fc689203
implement Width and Height functions, and test for image rotation and output opposite dimension. Fixes #1220
2016-01-04 13:15:50 -05:00
6df1425897
Slight update to allow the instantiation with no row or Id
2015-12-22 09:52:33 -05:00
961dc90b0e
add Server function
2015-12-02 11:21:04 -05:00
945949ebc0
fix __call to actually return the value
2015-12-01 15:16:18 -05:00
e85ba683e1
improve constructor to handle numeric as well, and give error when something else
2015-12-01 14:29:57 -05:00
e4f5f76782
rewrite constructor to take a row as well as an Id
2015-12-01 14:03:55 -05:00
ba1100fc03
continue conversion from array to class of Monitor
2015-09-17 16:06:47 -04:00
13327b7651
Load Controls if appropriate
2015-09-17 15:34:09 -04:00
52cdb8a05a
add Monitor class
2015-09-17 15:29:36 -04:00
Isaac Connor
Isaac Connor
Matthew Noorenberghe
Andrew Bauer
Isaac Connor
Isaac
Isaac Connor
Isaac Connor
Isaac Connor
Isaac Connor