Commit Graph

153 Commits

Author SHA1 Message Date
Isaac Connor
793f630ee0 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-04-02 10:43:07 -07:00
Pliable Pixels
d3350919de Reintroduced empty check rule, closed paranthesis 2018-03-27 10:55:36 -04:00
Pliable Pixels
5b7011c61b commented out incomplete definition - please complete it if you need it 2018-03-27 03:58:28 -04:00
Isaac Connor
c83e259160 revert to v3.1.0 of CRud 2018-03-22 12:01:38 -04:00
Isaac Connor
a4fee5c91c further merges from cakephp 2.10.8 2018-03-21 13:09:55 -04:00
Isaac Connor
1346558d59 Merge branch 'cake-2.10.8' of https://github.com/knnniggett/ZoneMinder into cake-2.10.8 2018-03-21 11:15:11 -04:00
Andy Bauer
0afe1e0971 recreate bootstrap.php.in 2018-03-17 21:16:17 -05:00
Andy Bauer
f9b7f931c9 upgrade lib folder to cakephp 2.10.8 2018-03-17 20:24:15 -05:00
Isaac Connor
27736fb5d9 Merge ../ZoneMinder.master into storageareas 2018-03-15 11:04:41 -04:00
mcdamo
aa0a831223 Update Host.php (#2062)
Remove whitespace causing problems with session authentication
2018-03-13 22:28:38 -04:00
Isaac Connor
b4c13d56d6 Merge ../ZoneMinder.master into storageareas 2018-03-06 12:29:59 -05:00
tim
0654c7e3b2 Adding group handling in API 2018-03-04 23:01:52 -08:00
Isaac Connor
7ec71868a6 Switch CakePHP-Enum-Behavior to my fixed version 2018-01-29 21:25:40 -05:00
Isaac Connor
456f29fcba Rename column Id OF Monitor_Statuses to simplify JOINS. 2018-01-26 13:39:37 -05:00
Isaac Connor
348fdafa4e Update submofule 2018-01-26 11:34:45 -05:00
Isaac Connor
475c465b0d define 2018-01-26 10:39:12 -05:00
Isaac Connor
a0892b1ffc Whitespace 2018-01-26 10:30:59 -05:00
Isaac Connor
1503c586d2 When there is an error saving, add the invalidFields() info to the error message. Only restart the daemon on success. 2018-01-26 10:30:29 -05:00
Isaac Connor
933259f9a5 fix bracket 2018-01-23 13:16:21 -08:00
Isaac Connor
bd2da456f4 handle non-multi-server case when restarting monitors via API 2018-01-19 21:09:33 -05:00
Isaac Connor
d586faf7fb Fix restarting Monitor 2018-01-19 08:16:28 -08:00
Isaac Connor
1b1b93f811 use CakePHP-Enum-Behavior to add support for ENUMs to the Monitor model. This should fix #48 2018-01-01 14:43:02 -05:00
Isaac Connor
1cd69c69b9 add defining ZM_SERVER_ID after loading config 2018-01-01 13:10:39 -05:00
Isaac Connor
bb8e326392 Fix not restarting a monitor if it has moved to a different server 2017-12-22 09:16:56 -08:00
Isaac Connor
85b7baa131 Fix event Groups associations 2017-12-19 18:09:41 -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
dd69bc3d7b Merge branch 'master' into storageareas 2017-12-11 11:39:42 -05:00
Isaac Connor
ef1af9cc15 disable FilterComponent as it doesn't actually do anything. Add Groups join when needed 2017-12-09 14:03:42 -05:00
Pliable Pixels
08b5c26a15 2019 maxscoreframeid (#2020)
* added MaxScoreFrameId to address #2019

* consistent quotes
2017-12-07 14:11:06 -05:00
Isaac Connor
f7a2db4e49 remove MaxScore from the sorting because it really doesn't make sense to sort by time then maxscore... time is going to be pretty much unique 2017-12-04 21:50:29 -05:00
Isaac Connor
97c9ae02c2 cleanup 2017-12-04 17:02:38 -05:00
Isaac Connor
6270408c8f rework group MonitorIds and add GroupId filters to api 2017-12-04 15:52:16 -05:00
Isaac Connor
03c9f88d55 fix build on trusty 2017-11-27 08:24:14 -05:00
Isaac Connor
489d3ba6ed Merge ../ZoneMinder.master into storageareas 2017-11-21 12:23:17 -05:00
APHW2 MFGENG
f093cfbcef add Filtering to monitors index 2017-11-13 10:27:24 -08:00
Pliable Pixels
a8fc832481 fix for monitor API edit perm (#1995) 2017-10-07 09:55:13 -04:00
APHW2 MFGENG
354262c557 wip nvsocket 2017-10-03 13:28:56 -07: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
efb02f3368 fix indent 2017-07-21 10:54:48 -04:00
Andrew Bauer
5cf2be528a Merge pull request #1950 from connortechnology/fix_api_logs
fix path to logs for api
2017-07-14 13:19:12 -05:00
Isaac Connor
240a990c7f fix writing to config 2017-07-14 12:19:43 -04:00
Isaac Connor
e203064bf7 updates bootstrap.php.in to match config.php's conf.d loading 2017-07-14 12:03:00 -04:00
Isaac Connor
13a72b7a99 fix path to logs for api 2017-07-14 11:58:15 -04:00
Isaac Connor
9824049c0c fix conf.d loading in api 2017-07-14 11:46:36 -04:00
Isaac Connor
84fd80b242 undo cake log path changes 2017-06-08 12:21:51 -04:00
Isaac Connor
c7b52bd998 fix logging dirs 2017-05-30 13:14:43 -04:00
Isaac Connor
75dc774a08 Continue to support non-USE_DEEP_STORAGE option 2017-05-22 21:21:49 -04:00
Matt N
33092e4022 Allow API authentication using the auth query parameter containing an auth. hash. (#1845)
* Allow API authentication using the `auth` query parameter containing an auth. hash.

Fixes #1827

The same auth. hash for zms is used here. This allows consumers to use the API without sending the password in the query string and not require forging logins via the login form.

* Move logger.php's global Debug function to Logger::Debug to avoid polluting globals

This avoids a conflict with CakePHP when logger.php gets included indrectly from API code.

* Protect action=login when ZM_ENABLE_CSRF_MAGIC is enabled
2017-05-15 21:51:48 -04:00