ade0d750c8
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-06-03 15:37:32 -04:00
6f42cb22d6
Use single quotes when escaping password so that $ has no effect. Also escape any single quotes in the password.
2020-06-03 15:36:47 -04:00
0e6ff1ad09
Detaint mysql commands in update script
2020-06-01 22:54:29 -07:00
bfa08c3422
MOstly spaces and quotes, remove duplicated db version update and only prepare the sth once.
2020-03-27 13:06:10 -04:00
766a59884d
Don't hard code perl path. Use PERL_EXECUTABLE cmake var
2019-09-23 12:54:27 -04:00
5f5d5f691a
Add backticks for mysql 8
2019-08-25 12:30:06 -04:00
0e72080c4a
Migrate from libdigest to crypt-eks-blowfish due to notice
2019-05-16 09:37:11 -04:00
e9f843f297
bulk overlay hash mysql encoded passwords
2019-05-13 14:29:24 -04:00
87e407aa90
forgot to checkin update file
2019-05-13 10:31:09 -04:00
63982a6282
Disable PRIVACY enable
2019-03-18 14:42:05 -04:00
f9139f2d98
Use the word skipped instead of aborted
2018-11-30 10:48:20 -05:00
8f0fb0843a
Add Privacy Statement ( #2194 )
...
* initial implementation of privacy popup
* split the privacy text and run it through translate
* change style of toggle button, validate the form
* fix copy/paste error
* fix typos
* display privacy view inline rather than popup
* display privacy inline if show_privacy flag set
* redirect to console after selection is made
* typo
* css formatting
* update privacy verbiage
* create and load default.php
* fix typos
* fix erroneous copy/paste
2018-08-30 13:25:02 -04:00
15a6eb7e78
Revert "Add Privacy Statement ( #2176 )" ( #2179 )
...
This reverts commit 56f4d768c2
2018-08-13 15:33:43 -04:00
56f4d768c2
Add Privacy Statement ( #2176 )
...
* initial implementation of privacy popup
* split the privacy text and run it through translate
* change style of toggle button, validate the form
* fix copy/paste error
* fix typos
* display privacy view inline rather than popup
* display privacy inline if show_privacy flag set
* redirect to console after selection is made
* typo
* css formatting
* update privacy verbiage
* push privacy text to all language files
2018-08-13 15:23:44 -04:00
d63594b5fa
don't do updates in a transaction so we don't hold locks
2018-01-22 14:06:52 -05:00
2682686063
Must disconnect and reconnect before calling update script
2018-01-19 16:32:26 -05:00
796ba0d899
revert to using the mysql client to do updates. We need it for delemiter changes when adding triggers
2018-01-04 17:16:43 -05:00
085d239a6e
Merge branch 'master' into storageareas
2017-06-13 18:02:28 -04:00
df304b417a
Update zmupdate.pl.in
2017-06-13 11:08:58 -05:00
bacf65ae9a
Migrate values from Options -> Paths to zm.conf ( #1908 )
...
* initial commit to migrate contents of Options->Paths to zm.conf
* remove paths items from configdata.pm
* remove paths tab from options
* update deb packaging scripts with new cmake vars
* remove extraneous file
* save custom paths variables to config file before dB is freshened
* don't check configs if the dB version is >= 1.31.0
2017-06-12 21:39:37 -04:00
f4224bb88e
Merge branch 'master' into storageareas
2017-05-17 17:47:39 -04:00
a933d4ae12
fix spacing and braces
2017-05-17 11:40:54 -04:00
3e35fc24a3
Add Socket Support to zmupdate ( #1867 )
...
* Update zmupdate.pl.in
* Fix spacing
* Update zmupdate.pl.in
2017-05-17 11:31:13 -04:00
052807aaf5
remove extra my
2017-01-15 10:57:39 -05:00
d24d151f53
Slurp db update file in and do() it instead of calling mysql
2017-01-15 10:54:23 -05:00
254fcbcef7
update gpl 2 mailing address in source files
2016-12-26 09:23:16 -06:00
fbc0086fcc
get the other dbPass use and quote it. Slight visual code style cleanup.
2016-08-08 16:52:09 -04:00
25d58f5192
quote the password
2016-08-02 13:22:44 -04:00
1069b301a0
functions have been moved from ConfigAdmin to Config
2016-06-12 15:38:59 -04:00
182fa9a5cd
revert the bulk of the merge_db_connects changes.
2016-05-20 08:53:53 -04:00
b53a0a564d
Don't need the extra use ZoneMinder::Config
2016-05-16 10:07:24 -04:00
dd24c35afa
revert bogus optimisation
2016-05-16 10:05:12 -04:00
5df85770cd
zmupdate.pl.in
2016-05-13 13:52:34 -04:00
9c72579c2e
Corrected typo in function info
2016-01-22 12:12:39 -06:00
5390605797
Add v to front of version string in version->parse to force conversion of decimal to dotted decimal versions, and change from ge to > to prevent reapplying current version
2015-12-03 10:23:19 +11:00
1cce60f6ec
Update version check URL
2015-10-23 11:45:32 -06:00
e0e048fe7e
fixed version compare logic
2015-10-04 09:10:05 -04:00
31ad75dea9
only add -h hostname to mysql command if it is defined. This helps support local unix-socket mysql access
2015-09-10 13:04:52 -04:00
b0909a4c57
autouse Data::Dumper
2015-04-16 15:48:51 +10:00
078c5aa14b
Briefly document "--migrate-events" option in zmupdate.pl ( #783 ).
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-04-06 18:38:14 +10:00
5f6c559476
POD: zmupdate.pl converted to "pod2usage"
...
Best practice for POD documentation is to (re-)use it for displaying usage
info. Now `perldoc zmupdate.pl` shows expected information and we can even
generate man page automatically with `pod2man zmupdate.pl`.
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-03-31 02:47:16 +11:00
cc989dbe19
fix putting the mode back. I merged it to the wrong place
2014-11-19 13:54:10 -05:00
793998484c
Merge branch 'master' into zmupdatefixes
...
Conflicts:
scripts/zmupdate.pl.in
2014-11-19 12:47:31 -05:00
d5a7a1849a
make zmupdate re-run the most recent update.
2014-07-29 09:47:22 -04:00
fd9e808fe1
Update zmupdate.pl.in
...
Fix typo 'from' version replaced with 'to' version.
2014-03-24 13:35:53 +00:00
e5ac6e95fa
Update zmupdate.pl.in
...
mysql generates a warning, instead of an error, when trying to convert to InnoDB and that engine is not available. By temporarily elevating warnings to errors, we can catch these rather than silently failing.
2014-02-04 15:30:04 -06:00
48a6dcf5ce
Change COnfig from using the subroutine symbol table to just using a global hash
2013-12-16 16:32:02 -05:00
150b3a0e7a
document interactive command line option
...
only do innoDB upgrade if interactive
2013-12-06 13:47:39 -05:00
f6dca0f575
Fixing bug that stops installation/upgrade if DB is already at current version
2013-11-20 10:39:51 +01:00
7da2cdd159
cleanups, only connect and disconnect once. Remove unncessary require's of DBI
...
cleanup MyISAM to InnoDB code
2013-11-13 11:45:53 -05:00
Isaac Connor
Kevin Stolp
Pliable Pixels
Andrew Bauer
Isaac Connor
Joshua Ruehlig
Andy Bauer
Isaac Connor
Isaac Connor
Brandon Odegard
SteveGilvarry
Kyle Johnson
Dmitry Smirnov
barjac
Andrew Bauer
Bartek Zdanowski