Commit Graph

117 Commits

Author SHA1 Message Date
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
Andrew Bauer
752959f3fc Update CMakeLists.txt
typo - remove extra "/"
2017-05-03 12:35:54 -05:00
Joshua Ruehlig
ca1e8a13fe Update database.php.default 2017-04-24 23:40:21 -07:00
Andrew Bauer
008624451f Merge pull request #1856 from connortechnology/remove_BOM
use dos2unix to remove BOM
2017-04-17 08:32:17 -05:00
Isaac Connor
5e0012569f use dos2unix to remove BOM 2017-04-16 09:22:37 -04:00
Isaac Connor
0efca38d68 Merge pull request #1854 from knnniggett/caketmp
make cake tmp = zoneminder tmp
2017-04-15 10:23:03 -04:00
Isaac Connor
ab4b5e6b69 Merge pull request #1853 from knnniggett/cakecache
change cake cache engine from File -> Apc
2017-04-14 21:10:23 -04:00
Andrew Bauer
0b729cf295 modify cmakelists.txt 2017-04-14 15:15:29 -05:00
Andrew Bauer
d2490cf7e3 make cake tmp = zoneminder tmp 2017-04-14 15:11:41 -05:00
Andrew Bauer
48a73f7e78 change cache engine from File -> Apc 2017-04-14 14:31:42 -05:00
Andrew Bauer
3cbd32cd41 move cake log to zoneminder log folder 2017-04-14 14:24:29 -05:00
Matthew Noorenberghe
ea558c79a0 Fix check that API user is enabled 2017-03-20 17:16:24 -07:00
Matthew Noorenberghe
df4739826b Reduce the default API debug level 2017-02-18 23:06:53 -08:00
Andy Bauer
2dda2d9e1e remove unneeded, empty files 2016-12-26 09:49:14 -06:00
Pliable Pixels
192d0dbb45 added TimeZone get API 2016-10-18 14:07:31 -04:00
Pliable Pixels
92d7cad5f1 enabled utf8 2016-09-21 11:53:34 -04:00
Pliable Pixels
1440dd9265 retab 2016-09-03 15:02:32 -04:00
Pliable Pixels
7bf0b3c423 readded forMonitor - removed by mistake 2016-09-03 14:51:24 -04:00
Pliable Pixels
9a4330eb59 #1537 Zones Controller not returning all zones 2016-09-03 14:46:47 -04:00
Isaac Connor
55f5db55dd implement suggested code to stop the monitor when Function is set to None 2016-09-01 11:43:20 -04:00
Isaac Connor
b4aec41d3d fix warnings and move User import up higher to where it needs to be 2016-06-21 09:09:58 -04:00
Isaac Connor
dbdd1ae51e remove debug logging 2016-06-07 16:26:58 -04:00
Isaac Connor
f26c9168c4 if user=&pass= are in request, use them for auth 2016-06-07 16:25:35 -04:00
Andrew Bauer
ceaacf91bf Merge pull request #1470 from connortechnology/api_improvements
Api improvements
2016-05-25 12:45:03 -05:00
arjunrc
4018cab743 don't pass partial data to daemoncontrol 2016-05-19 14:53:16 -04:00
arjunrc
b513bcef82 icon's gonna kill me 2016-05-10 20:09:41 -04:00
arjunrc
af3cae578e fixed verbose handling bug for status command on zmu 2016-05-10 20:07:28 -04:00
arjunrc
8d5f2a8e5d added iconnor's change back 2016-05-10 19:17:09 -04:00
arjunrc
df830a5190 resolved merge conflicts 2016-05-10 19:15:00 -04:00
arjunrc
2888142e68 added status command to retrieve alarmed status of monitor in addition to on/of 2016-05-10 16:55:43 -04:00
Steve Gilvarry
b03d2660cb Merge pull request #1455 from ZoneMinder/api_servers
rough in Server object support
2016-05-10 08:00:58 +10:00
Joshua Ruehlig
e12160456b Support user defined MySQL Port/Socket in API 2016-05-09 00:24:08 -07:00
Isaac Connor
966a9dcd8d Merge pull request #1467 from ZoneMinder/api_fixes
Don't pass request data as a monitor array to daemonControl
2016-05-07 18:25:35 -04:00
Isaac Connor
e35b0a1eb2 Merge pull request #1469 from pliablepixels/1468-api-consoleEvents-alarmedFrames
added alarmed frames filter
2016-05-07 17:06:37 -04:00
arjunrc
be329e1e0d switched to named param format, more flexible, in line with other APIs 2016-05-07 16:28:25 -04:00
arjunrc
8347b69b09 added alarmed frames filter 2016-05-07 14:26:09 -04:00
Isaac Connor
6d991a1c6c Merge pull request #1466 from pliablepixels/1465-api-alarm-on-off
added alarm enable/disable
2016-05-07 11:26:49 -04:00