Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
ispconfig3
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Daniel Hürtgen
ispconfig3
Commits
0ccfef02
Commit
0ccfef02
authored
10 years ago
by
Till Brehm
Browse files
Options
Downloads
Patches
Plain Diff
Added silent sql update option in updater.
parent
f3cc7cd0
Branches
Branches containing commit
Tags
3.0.5.4
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
install/lib/update.lib.php
+9
-2
9 additions, 2 deletions
install/lib/update.lib.php
with
9 additions
and
2 deletions
install/lib/update.lib.php
+
9
−
2
View file @
0ccfef02
...
...
@@ -164,6 +164,9 @@ function updateDbAndIni() {
$next_db_version
=
intval
(
$current_db_version
+
1
);
$sql_patch_filename
=
realpath
(
dirname
(
__FILE__
)
.
'/../'
)
.
'/sql/incremental/upd_'
.
str_pad
(
$next_db_version
,
4
,
'0'
,
STR_PAD_LEFT
)
.
'.sql'
;
$php_patch_filename
=
realpath
(
dirname
(
__FILE__
)
.
'/../'
)
.
'/patches/upd_'
.
str_pad
(
$next_db_version
,
4
,
'0'
,
STR_PAD_LEFT
)
.
'.php'
;
// comma separated list of version numbers were a update has to be done silently
$silent_update_versions
=
'75'
;
if
(
is_file
(
$sql_patch_filename
))
{
...
...
@@ -186,10 +189,14 @@ function updateDbAndIni() {
//* Load patch file into database
if
(
!
empty
(
$conf
[
"mysql"
][
"admin_password"
])
)
{
system
(
"mysql --default-character-set="
.
escapeshellarg
(
$conf
[
'mysql'
][
'charset'
])
.
" --force -h "
.
escapeshellarg
(
$conf
[
'mysql'
][
'host'
])
.
" -u "
.
escapeshellarg
(
$conf
[
'mysql'
][
'admin_user'
])
.
" -p"
.
escapeshellarg
(
$conf
[
'mysql'
][
'admin_password'
])
.
" "
.
escapeshellarg
(
$conf
[
'mysql'
][
'database'
])
.
" < "
.
$sql_patch_filename
)
;
$cmd
=
"mysql --default-character-set="
.
escapeshellarg
(
$conf
[
'mysql'
][
'charset'
])
.
" --force -h "
.
escapeshellarg
(
$conf
[
'mysql'
][
'host'
])
.
" -u "
.
escapeshellarg
(
$conf
[
'mysql'
][
'admin_user'
])
.
" -p"
.
escapeshellarg
(
$conf
[
'mysql'
][
'admin_password'
])
.
" "
.
escapeshellarg
(
$conf
[
'mysql'
][
'database'
])
.
" < "
.
$sql_patch_filename
;
}
else
{
system
(
"mysql --default-character-set="
.
escapeshellarg
(
$conf
[
'mysql'
][
'charset'
])
.
" --force -h "
.
escapeshellarg
(
$conf
[
'mysql'
][
'host'
])
.
" -u "
.
escapeshellarg
(
$conf
[
'mysql'
][
'admin_user'
])
.
" "
.
escapeshellarg
(
$conf
[
'mysql'
][
'database'
])
.
" < "
.
$sql_patch_filename
)
;
$cmd
=
"mysql --default-character-set="
.
escapeshellarg
(
$conf
[
'mysql'
][
'charset'
])
.
" --force -h "
.
escapeshellarg
(
$conf
[
'mysql'
][
'host'
])
.
" -u "
.
escapeshellarg
(
$conf
[
'mysql'
][
'admin_user'
])
.
" "
.
escapeshellarg
(
$conf
[
'mysql'
][
'database'
])
.
" < "
.
$sql_patch_filename
;
}
if
(
in_array
(
$next_db_version
,
explode
(
','
,
$silent_update_versions
)))
$cmd
.
=
' > /dev/null 2> /dev/null'
;
system
(
$cmd
);
swriteln
(
$inst
->
lng
(
'Loading SQL patch file'
)
.
': '
.
$sql_patch_filename
);
//* Exec onAfterSQL function
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment