Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISPConfig
ISPConfig 3
Commits
af4c7ab6
Commit
af4c7ab6
authored
Apr 15, 2015
by
Marius Cramer
Browse files
- ported some patches
parent
b418037a
Changes
2
Hide whitespace changes
Inline
Side-by-side
interface/lib/classes/remote.d/sites.inc.php
View file @
af4c7ab6
...
...
@@ -405,7 +405,7 @@ class remoting_sites extends remoting {
return
false
;
}
$app
->
uses
(
'remoting_lib'
);
$app
->
remoting_lib
->
loadFormDef
(
'../sites/form/web_domain.tform.php'
);
$app
->
remoting_lib
->
loadFormDef
(
'../sites/form/web_
vhost_
domain.tform.php'
);
return
$app
->
remoting_lib
->
getDataRecord
(
$primary_id
);
}
...
...
@@ -434,7 +434,7 @@ class remoting_sites extends remoting {
if
(
$params
[
'pm_min_spare_servers'
]
==
''
)
$params
[
'pm_min_spare_servers'
]
=
1
;
if
(
$params
[
'pm_max_spare_servers'
]
==
''
)
$params
[
'pm_max_spare_servers'
]
=
1
;
$domain_id
=
$this
->
insertQuery
(
'../sites/form/web_domain.tform.php'
,
$client_id
,
$params
,
'sites:web_domain:on_after_insert'
);
$domain_id
=
$this
->
insertQuery
(
'../sites/form/web_
vhost_
domain.tform.php'
,
$client_id
,
$params
,
'sites:web_domain:on_after_insert'
);
if
(
$readonly
===
true
)
$app
->
db
->
query
(
"UPDATE web_domain SET `sys_userid` = '1' WHERE domain_id = ?"
,
$domain_id
);
return
$domain_id
;
...
...
@@ -454,7 +454,7 @@ class remoting_sites extends remoting {
if
(
$params
[
'pm_min_spare_servers'
]
==
''
)
$params
[
'pm_min_spare_servers'
]
=
1
;
if
(
$params
[
'pm_max_spare_servers'
]
==
''
)
$params
[
'pm_max_spare_servers'
]
=
1
;
$affected_rows
=
$this
->
updateQuery
(
'../sites/form/web_domain.tform.php'
,
$client_id
,
$primary_id
,
$params
);
$affected_rows
=
$this
->
updateQuery
(
'../sites/form/web_
vhost_
domain.tform.php'
,
$client_id
,
$primary_id
,
$params
);
return
$affected_rows
;
}
...
...
@@ -465,7 +465,7 @@ class remoting_sites extends remoting {
throw
new
SoapFault
(
'permission_denied'
,
'You do not have the permissions to access this function.'
);
return
false
;
}
$affected_rows
=
$this
->
deleteQuery
(
'../sites/form/web_domain.tform.php'
,
$primary_id
);
$affected_rows
=
$this
->
deleteQuery
(
'../sites/form/web_
vhost_
domain.tform.php'
,
$primary_id
);
return
$affected_rows
;
}
...
...
@@ -864,11 +864,11 @@ class remoting_sites extends remoting {
}
else
{
$status
=
'n'
;
}
$app
->
remoting_lib
->
loadFormDef
(
'../sites/form/web_domain.tform.php'
);
$app
->
remoting_lib
->
loadFormDef
(
'../sites/form/web_
vhost_
domain.tform.php'
);
$params
=
$app
->
remoting_lib
->
getDataRecord
(
$primary_id
);
$params
[
'active'
]
=
$status
;
$affected_rows
=
$this
->
updateQuery
(
'../sites/form/web_domain.tform.php'
,
0
,
$primary_id
,
$params
);
$affected_rows
=
$this
->
updateQuery
(
'../sites/form/web_
vhost_
domain.tform.php'
,
0
,
$primary_id
,
$params
);
return
$affected_rows
;
}
else
{
throw
new
SoapFault
(
'status_undefined'
,
'The status is not available'
);
...
...
interface/lib/classes/remoting.inc.php
View file @
af4c7ab6
...
...
@@ -340,6 +340,7 @@ class remoting {
//* Get the SQL query
$sql
=
$app
->
remoting_lib
->
getSQL
(
$params
,
'UPDATE'
,
$primary_id
);
// throw new SoapFault('debug', $sql);
if
(
$app
->
remoting_lib
->
errorMessage
!=
''
)
{
throw
new
SoapFault
(
'data_processing_error'
,
$app
->
remoting_lib
->
errorMessage
);
...
...
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