Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
ISPConfig
ISPConfig 3
Commits
e92eda20
Commit
e92eda20
authored
Feb 15, 2014
by
Till Brehm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed: FS#3312 - Bug in APS remove
parent
5e10d2d2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
1 deletion
+13
-1
install/lib/installer_base.lib.php
install/lib/installer_base.lib.php
+9
-1
server/lib/classes/aps_installer.inc.php
server/lib/classes/aps_installer.inc.php
+4
-0
No files found.
install/lib/installer_base.lib.php
View file @
e92eda20
...
...
@@ -474,7 +474,15 @@ class installer_base {
$this
->
warning
(
'Unable to set rights of user in master database: '
.
$value
[
'db'
]
.
"
\n
Query: "
.
$query
.
"
\n
Error: "
.
$this
->
dbmaster
->
errorMessage
);
}
$query
=
"GRANT SELECT, UPDATE ON "
.
$value
[
'db'
]
.
".`aps_instances` TO '"
.
$value
[
'user'
]
.
"'@'"
.
$host
.
"' "
;
$query
=
"GRANT SELECT, UPDATE, DELETE ON "
.
$value
[
'db'
]
.
".`aps_instances` TO '"
.
$value
[
'user'
]
.
"'@'"
.
$host
.
"' "
;
if
(
$verbose
){
echo
$query
.
"
\n
"
;
}
if
(
!
$this
->
dbmaster
->
query
(
$query
))
{
$this
->
warning
(
'Unable to set rights of user in master database: '
.
$value
[
'db'
]
.
"
\n
Query: "
.
$query
.
"
\n
Error: "
.
$this
->
dbmaster
->
errorMessage
);
}
$query
=
"GRANT SELECT, DELETE ON "
.
$value
[
'db'
]
.
".`aps_instances_settings` TO '"
.
$value
[
'user'
]
.
"'@'"
.
$host
.
"' "
;
if
(
$verbose
){
echo
$query
.
"
\n
"
;
}
...
...
server/lib/classes/aps_installer.inc.php
View file @
e92eda20
...
...
@@ -739,6 +739,10 @@ class ApsInstaller extends ApsBase
{
$app
->
db
->
query
(
'DELETE FROM aps_instances WHERE id = "'
.
$app
->
db
->
quote
(
$task
[
'instance_id'
])
.
'";'
);
$app
->
db
->
query
(
'DELETE FROM aps_instances_settings WHERE instance_id = "'
.
$app
->
db
->
quote
(
$task
[
'instance_id'
])
.
'";'
);
if
(
$app
->
dbmaster
!=
$app
->
db
)
{
$app
->
dbmaster
->
query
(
'DELETE FROM aps_instances WHERE id = "'
.
$app
->
db
->
quote
(
$task
[
'instance_id'
])
.
'";'
);
$app
->
dbmaster
->
query
(
'DELETE FROM aps_instances_settings WHERE instance_id = "'
.
$app
->
db
->
quote
(
$task
[
'instance_id'
])
.
'";'
);
}
}
unset
(
$sxe
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment