ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,629 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

52 Commits

Author SHA1 Message Date
Isaac Connor 31b7deb101 Return NULL on error in dbQuery 2018-01-29 10:41:24 -08:00
Isaac Connor 97595051ce whitespace 2018-01-22 11:42:19 -05:00
Isaac Connor 0171d532fc fix the test for DB_DEBUG 2017-12-04 16:50:56 -05:00
Isaac Connor 1ccd344bf5 implement Storage Area move 2017-12-04 11:05:50 -05:00
Isaac Connor cb70a3627f Fixes to montagereview and only load event data when in History mode 2017-11-28 14:50:21 -05:00
Isaac Connor b1bb0020d3 turn off database debug 2017-11-24 15:42:44 -05:00
Isaac Connor 9dd0f29e88 Merge branch 'storageareas' into tesla 2017-11-22 11:41:11 -08:00
Isaac Connor 59a87c14d3 fix error message 2017-11-08 11:17:46 -05:00
Isaac Connor 63c788ef0e handle when sql error occurs and no params given 2017-11-03 15:45:11 -04:00
Isaac Connor ce6cc24de5 turn off debug 2017-10-30 20:20:40 -04:00
Isaac Connor a6c790b374 use a shared include for the filters bar 2017-10-30 07:37:08 -07:00
Isaac Connor b6dde354be rename AnalysisFPS to AnalysisFPSLimit 2017-10-24 17:34:32 -07:00
Isaac Connor 32ba53cf1b turn off database debugging 2017-10-18 16:37:45 -04:00
Isaac Connor ba4e5572d6 add setting of values to anonymouse member function 2017-10-17 10:09:14 -07:00
Isaac Connor e845af94cc include params when blowing up a dbQuery 2017-10-11 14:06:18 -04:00
Isaac Connor aaffe475d8 turn off debug 2017-10-10 12:39:23 -07:00
Isaac Connor a9d3be549f try caching storage 2017-10-10 10:39:17 -07:00
Isaac Connor 40972383c1 remove debug 2017-10-05 10:48:04 -04:00
Isaac Connor 87a49ad009 work on infinite depths of groups 2017-10-04 16:40:09 -04:00
Isaac Connor b5a5f45e04 turn off debug 2017-10-02 10:06:07 -04:00
Isaac Connor 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
Isaac Connor 676c4b7ddc Merge branch 'master' into storageareas 2017-08-22 09:52:14 -04:00
Isaac Connor f573158fbb fix breakage caused by empty SSL_CERT options 2017-08-15 19:40:02 -04:00
Isaac Connor adab628af9 fix video speed, various other 2017-08-14 18:22:52 -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 29bcab9204 fix Debug to Logger::Debug 2017-05-18 13:54:06 -04:00
Isaac Connor 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
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
Joshua Ruehlig 05a141bf78 Update database.php 2017-04-24 23:40:52 -07:00
Kyle Johnson 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
Andy Bauer 254fcbcef7 update gpl 2 mailing address in source files 2016-12-26 09:23:16 -06:00
josh4trunks 2ab79820a1 Add back changes 2016-05-22 08:08:12 -07:00
Isaac Connor ce6f8da098 Use PDO::error_string instead of mysql_error 2016-04-09 11:23:35 -04:00
Isaac Connor 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
Isaac Connor bec58a6011 fixes WRT to db logging. I believe fixes issue #504 2014-09-26 14:43:58 -04:00
Isaac Connor 86b04d0e6f fixup dbFetchMOnitor 2013-12-06 14:22:07 -05:00
Isaac Connor 969918781f more updates, currently the log updates are not enough. Filtering does not work. 2013-11-13 10:11:16 -05:00
Isaac Connor 03809cfa0f improve error reporting 2013-11-07 10:58:27 -05:00
Isaac Connor 4c6c415f02 fix: wrote dbCon instead of dbConn 2013-11-07 10:03:19 -05:00
Isaac Connor 51455b5c85 more updates and removal of escaping and quoting 2013-11-04 12:43:34 -05:00
Isaac Connor 7fdb933d6b rework dbQuery, dbFetchOne to take a parameters array, and use it 2013-10-18 14:15:24 -04:00
Isaac Connor 92591a6835 more removal of quotes 2013-10-17 17:05:50 -04:00
Isaac Connor 36c4fad644 remove extra quoets since dbEcape does quoting now 2013-10-17 15:35:23 -04:00
Isaac Connor b126c5ae7e fix typo 2013-10-16 16:55:24 -04:00
Isaac Connor 9e2d7cfd24 initial convert to PDO with no testing 2013-10-16 16:07:58 -04:00
stan 6ff385e407 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3459 e3e1d417-86f3-4887-817a-d78f3d33393f 2011-06-21 09:19:10 +00:00
stan 0cdc6e89ef Added utility function 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3065 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-05-27 12:18:06 +00:00
stan 545ca029e3 Added next auto inc function 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2825 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-31 10:53:51 +00:00
stan 69b9f78343 Added associate fetch function. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2705 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-12-05 23:15:08 +00:00
stan 106882c161 Updated copyright notices 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2612 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-25 09:48:16 +00:00