00e82fb751
Implement MonitoServerId,StorageServerId,FilterServerID in Filters
2018-04-25 13:05:19 -07:00
117555a857
Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas
2018-04-25 09:39:10 -04:00
161fc94496
remove useless ()
2018-04-25 09:33:12 -04:00
9fd2c12765
DB Logging is a Debug level
2018-04-24 08:42:52 -04:00
bbee7fd0f2
fix array_key_exists
2018-04-18 14:17:41 -07:00
75248e7465
use array_key_exists instead of isset so that we can return nulls
2018-04-18 14:21:27 -04:00
6b6fdc7cee
Log the sql before running it
2018-02-09 07:29:10 -08:00
929e49c301
early return if there is no rows returned. Improve debug when there is a row but the specified column isn't present
2018-02-02 10:27:30 -05:00
212882efb9
db errors should NOT BE FATAL!
2018-02-01 11:31:25 -05:00
31b7deb101
Return NULL on error in dbQuery
2018-01-29 10:41:24 -08:00
97595051ce
whitespace
2018-01-22 11:42:19 -05:00
0171d532fc
fix the test for DB_DEBUG
2017-12-04 16:50:56 -05:00
1ccd344bf5
implement Storage Area move
2017-12-04 11:05:50 -05:00
cb70a3627f
Fixes to montagereview and only load event data when in History mode
2017-11-28 14:50:21 -05:00
b1bb0020d3
turn off database debug
2017-11-24 15:42:44 -05:00
9dd0f29e88
Merge branch 'storageareas' into tesla
2017-11-22 11:41:11 -08:00
59a87c14d3
fix error message
2017-11-08 11:17:46 -05:00
63c788ef0e
handle when sql error occurs and no params given
2017-11-03 15:45:11 -04:00
ce6cc24de5
turn off debug
2017-10-30 20:20:40 -04:00
a6c790b374
use a shared include for the filters bar
2017-10-30 07:37:08 -07:00
b6dde354be
rename AnalysisFPS to AnalysisFPSLimit
2017-10-24 17:34:32 -07:00
32ba53cf1b
turn off database debugging
2017-10-18 16:37:45 -04:00
ba4e5572d6
add setting of values to anonymouse member function
2017-10-17 10:09:14 -07:00
e845af94cc
include params when blowing up a dbQuery
2017-10-11 14:06:18 -04:00
aaffe475d8
turn off debug
2017-10-10 12:39:23 -07:00
a9d3be549f
try caching storage
2017-10-10 10:39:17 -07:00
40972383c1
remove debug
2017-10-05 10:48:04 -04:00
87a49ad009
work on infinite depths of groups
2017-10-04 16:40:09 -04:00
b5a5f45e04
turn off debug
2017-10-02 10:06:07 -04:00
4be133ed09
remove btn styles from buttons. make groups, cycle, montage, montage review non-popups. Add datetime filters to montagereview. Fix dark skin
2017-09-30 14:19:32 -04:00
676c4b7ddc
Merge branch 'master' into storageareas
2017-08-22 09:52:14 -04:00
f573158fbb
fix breakage caused by empty SSL_CERT options
2017-08-15 19:40:02 -04:00
adab628af9
fix video speed, various other
2017-08-14 18:22:52 -04:00
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
29bcab9204
fix Debug to Logger::Debug
2017-05-18 13:54:06 -04:00
dd75c4676b
trivial updates ( #1887 )
...
* merge some trivial updates from storageareas
* fix the code to do zm.conf.new
2017-05-16 14:16:32 -04:00
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
05a141bf78
Update database.php
2017-04-24 23:40:52 -07:00
6b3a53ec0f
Tell PDO to use real prepared statements.
...
This makes sure the statement and the values aren't
parsed by PHP before sending it to the MySQL server.
See https://stackoverflow.com/questions/60174/how-can-i-prevent-sql-injection-in-php
and https://secure.php.net/manual/en/pdo.setattribute.php
2017-02-04 14:59:33 -07:00
254fcbcef7
update gpl 2 mailing address in source files
2016-12-26 09:23:16 -06:00
2ab79820a1
Add back changes
2016-05-22 08:08:12 -07:00
ce6f8da098
Use PDO::error_string instead of mysql_error
2016-04-09 11:23:35 -04:00
a0d4934b84
Have PDO actually throw exceptions on db errors. Prior to this it would have been just failing silently. Also, fix a . to -> in the exception catcher.
2015-11-11 16:56:28 -05:00
bec58a6011
fixes WRT to db logging. I believe fixes issue #504
2014-09-26 14:43:58 -04:00
86b04d0e6f
fixup dbFetchMOnitor
2013-12-06 14:22:07 -05:00
969918781f
more updates, currently the log updates are not enough. Filtering does not work.
2013-11-13 10:11:16 -05:00
03809cfa0f
improve error reporting
2013-11-07 10:58:27 -05:00
4c6c415f02
fix: wrote dbCon instead of dbConn
2013-11-07 10:03:19 -05:00
51455b5c85
more updates and removal of escaping and quoting
2013-11-04 12:43:34 -05:00
7fdb933d6b
rework dbQuery, dbFetchOne to take a parameters array, and use it
2013-10-18 14:15:24 -04:00
Isaac Connor
Isaac Connor
Isaac Connor
Isaac Connor
Isaac Connor
Isaac Connor
ralimi
Matt N
Joshua Ruehlig
Kyle Johnson
Andy Bauer
Isaac Connor