Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
ISPConfig 3
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lolo888
ISPConfig 3
Commits
c8f20307
Commit
c8f20307
authored
Aug 25, 2011
by
tbrehm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed bug in remoting lib when clients were created and a bug in openvz actions.
parent
c161eacd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
4 deletions
+13
-4
interface/lib/classes/remoting.inc.php
interface/lib/classes/remoting.inc.php
+9
-4
server/mods-available/remoteaction_core_module.inc.php
server/mods-available/remoteaction_core_module.inc.php
+4
-0
No files found.
interface/lib/classes/remoting.inc.php
View file @
c8f20307
...
...
@@ -2132,23 +2132,28 @@ class remoting {
//* Get the SQL query
$sql
=
$app
->
remoting_lib
->
getSQL
(
$params
,
'INSERT'
,
0
);
$app
->
db
->
query
(
$sql
);
if
(
$app
->
remoting_lib
->
errorMessage
!=
''
)
{
$this
->
server
->
fault
(
'data_processing_error'
,
$app
->
remoting_lib
->
errorMessage
);
return
false
;
}
$app
->
db
->
query
(
$sql
);
$insert_id
=
$app
->
db
->
insertID
();
$this
->
id
=
$insert_id
;
$this
->
dataRecord
=
$params
;
$app
->
plugin
->
raiseEvent
(
'client:client:on_after_insert'
,
$this
);
/*
if($app->db->errorMessage != '') {
$this->server->fault('database_error', $app->db->errorMessage . ' '.$sql);
return false;
}
*/
$insert_id
=
$app
->
db
->
insertID
();
//$app->uses('tform');
//* Save changes to Datalog
if
(
$app
->
remoting_lib
->
formDef
[
"db_history"
]
==
'yes'
)
{
...
...
server/mods-available/remoteaction_core_module.inc.php
View file @
c8f20307
...
...
@@ -131,18 +131,21 @@ class remoteaction_core_module {
if
(
$veid
>
0
)
{
exec
(
"vzctl start
$veid
"
);
}
$this
->
_actionDone
(
$action
[
'action_id'
],
'ok'
);
}
if
(
$action
[
'action_type'
]
==
'openvz_stop_vm'
)
{
$veid
=
intval
(
$action
[
'action_param'
]);
if
(
$veid
>
0
)
{
exec
(
"vzctl stop
$veid
"
);
}
$this
->
_actionDone
(
$action
[
'action_id'
],
'ok'
);
}
if
(
$action
[
'action_type'
]
==
'openvz_restart_vm'
)
{
$veid
=
intval
(
$action
[
'action_param'
]);
if
(
$veid
>
0
)
{
exec
(
"vzctl restart
$veid
"
);
}
$this
->
_actionDone
(
$action
[
'action_id'
],
'ok'
);
}
if
(
$action
[
'action_type'
]
==
'openvz_create_ostpl'
)
{
$parts
=
explode
(
':'
,
$action
[
'action_param'
]);
...
...
@@ -155,6 +158,7 @@ class remoteaction_core_module {
exec
(
"mv "
.
$template_cache_dir
.
"vzdump-openvz-"
.
$veid
.
"*.tgz "
.
$template_cache_dir
.
$template_name
.
".tar.gz"
);
exec
(
"rm -f "
.
$template_cache_dir
.
"vzdump-openvz-"
.
$veid
.
"*.log"
);
}
$this
->
_actionDone
(
$action
[
'action_id'
],
'ok'
);
/* this action takes so much time,
* we stop executing the actions not to waste more time */
return
;
...
...
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