861ebedcae
Implement a crude view for a failed db connection with a 30 second reload interval.
2020-09-21 11:15:34 -04:00
2d05fbda8d
simplify debug line
2020-08-24 14:36:36 -04:00
198790796d
Merge branch 'release-1.34'
...
plus cleanups in dbConnect
2020-06-05 19:02:43 -04:00
8802447b10
Handle no DB_HOST specifed so default to localhost
2020-06-04 11:36:10 -04:00
c4b2aa4a85
Handle no DB_HOST specifed so default to localhost
2020-06-04 11:34:16 -04:00
689956bba7
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2019-12-13 17:49:00 -05:00
bedc61a347
handle dbFetchNext on null result more gracefully
2019-12-13 11:49:55 -05:00
4632bbd124
Apply relevant changes to deal with php7,4 deprecations
2019-12-07 11:45:32 -05:00
393f0a369c
Revamp timeline. Make it handle being full browser width. remove onclicks.
2019-09-28 14:23:23 -04:00
daa9f646fb
fix error printing
2019-09-19 14:56:34 -04:00
d5aa95e45f
cpplint fixes
2019-09-09 16:13:32 -04:00
4140d51e9f
database.php cleanup. remove dbFetchMonitor and dbFetchGroup. Their usage has been replaced with the Object::find_one usage. Also more quoting of table and colume names to fix #2659
2019-08-13 11:45:50 -04:00
4765b9d936
Don't generate php errors when returned row doesn't have the specified column
2019-05-24 14:52:04 -04:00
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
a066968aca
fix dbError and cause it to return the error string instead of just logging it. Add error logging of db errors that don't throw exceptions.
2018-11-07 12:33:18 -05:00
7ee80e7cca
Debug lines should be debug, not warning
2018-08-31 11:58:03 -04:00
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
Isaac Connor
Isaac Connor
Isaac Connor
Isaac Connor
Isaac Connor
Isaac Connor
Isaac Connor
ralimi