From bb0c7702e7f2698aa73c94c891e74ef7d97e5e97 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 12 Jan 2012 05:18:54 -0500
Subject: [PATCH] Allow subqueries of strings in remote API.
---
interface/lib/classes/remoting.inc.php | 192 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 185 insertions(+), 7 deletions(-)
diff --git a/interface/lib/classes/remoting.inc.php b/interface/lib/classes/remoting.inc.php
index 1c97176..3330447 100644
--- a/interface/lib/classes/remoting.inc.php
+++ b/interface/lib/classes/remoting.inc.php
@@ -1342,6 +1342,23 @@
$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
return false;
}
+
+ if(!isset($params['client_group_id']) or (isset($params['client_group_id']) && empty($params['client_group_id']))) {
+ $rec = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = ".intval($client_id));
+ $params['client_group_id'] = $rec['groupid'];
+ }
+
+ //* Set a few params to "not empty" values which get overwritten by the sites_web_domain_plugin
+ if($params['document_root'] == '') $params['document_root'] = '-';
+ if($params['system_user'] == '') $params['system_user'] = '-';
+ if($params['system_group'] == '') $params['system_group'] = '-';
+
+ //* Set a few defaults for nginx servers
+ if($params['pm_max_children'] == '') $params['pm_max_children'] = 1;
+ if($params['pm_start_servers'] == '') $params['pm_start_servers'] = 1;
+ 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');
if ($readonly === true)
$app->db->query("UPDATE web_domain SET `sys_userid` = '1' WHERE domain_id = ".$domain_id);
@@ -1355,6 +1372,13 @@
$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
return false;
}
+
+ //* Set a few defaults for nginx servers
+ if($params['pm_max_children'] == '') $params['pm_max_children'] = 1;
+ if($params['pm_start_servers'] == '') $params['pm_start_servers'] = 1;
+ 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);
return $affected_rows;
}
@@ -2132,23 +2156,33 @@
//* Get the SQL query
$sql = $app->remoting_lib->getSQL($params,'INSERT',0);
+ $app->db->query($sql);
+
+ //* Check if no system user with that username exists
+ $username = $app->db->quote($params["username"]);
+ $tmp = $app->db->queryOneRecord("SELECT count(userid) as number FROm sys_user WHERE username = '$username'");
+ if($tmp['number'] > 0) $app->remoting_lib->errorMessage .= "Duplicate username<br />";
+
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') {
@@ -2500,13 +2534,13 @@
public function sites_database_get_all_by_user($session_id, $client_id)
{
global $app;
- if(!$this->checkPerm($session_id, 'sites_database_get_all_by_user')) {
+ if(!$this->checkPerm($session_id, 'sites_database_get')) {
$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
return false;
}
$client_id = intval($client_id);
- $sql = "SELECT database_id, database_name, database_user, database_password FROM web_database WHERE sys_userid = $client_id ";
- $all = $app->db->queryAllRecords($sql);
+ $sql = "SELECT d.database_id, d.database_name, d.database_user, d.database_password FROM web_database d INNER JOIN sys_user s on(d.sys_groupid = s.default_group) WHERE client_id = $client_id";
+ $all = $app->db->queryAllRecords($sql);
return $all;
}
@@ -2925,8 +2959,152 @@
return $affected_rows;
}
+ //* Start VM
+ public function openvz_vm_start($session_id, $vm_id)
+ {
+ global $app;
+
+ if(!$this->checkPerm($session_id, 'vm_openvz')) {
+ $this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+ return false;
+ }
+
+ $app->uses('remoting_lib');
+ $app->remoting_lib->loadFormDef('../vm/form/openvz_vm.tform.php');
+ $vm = $app->remoting_lib->getDataRecord($vm_id);
+
+ if(!is_array($vm)) {
+ $this->server->fault('action_pending', 'No VM with this ID available.');
+ return false;
+ }
+
+ if($vm['active'] == 'n') {
+ $this->server->fault('action_pending', 'VM is not in active state.');
+ return false;
+ }
+
+ $action = 'openvz_start_vm';
+
+ $tmp = $app->db->queryOneRecord("SELECT count(action_id) as actions FROM sys_remoteaction
+ WHERE server_id = '".$vm['server_id']."'
+ AND action_type = '$action'
+ AND action_param = '".$vm['veid']."'
+ AND action_state = 'pending'");
+
+ if($tmp['actions'] > 0) {
+ $this->server->fault('action_pending', 'There is already a action pending for this VM.');
+ return false;
+ } else {
+ $sql = "INSERT INTO sys_remoteaction (server_id, tstamp, action_type, action_param, action_state, response) " .
+ "VALUES (".
+ (int)$vm['server_id'] . ", ".
+ time() . ", ".
+ "'".$action."', ".
+ $vm['veid'].", ".
+ "'pending', ".
+ "''".
+ ")";
+ $app->db->query($sql);
+ }
+ }
+ //* Stop VM
+ public function openvz_vm_stop($session_id, $vm_id)
+ {
+ global $app;
+
+ if(!$this->checkPerm($session_id, 'vm_openvz')) {
+ $this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+ return false;
+ }
+
+ $app->uses('remoting_lib');
+ $app->remoting_lib->loadFormDef('../vm/form/openvz_vm.tform.php');
+ $vm = $app->remoting_lib->getDataRecord($vm_id);
+
+ if(!is_array($vm)) {
+ $this->server->fault('action_pending', 'No VM with this ID available.');
+ return false;
+ }
+
+ if($vm['active'] == 'n') {
+ $this->server->fault('action_pending', 'VM is not in active state.');
+ return false;
+ }
+
+ $action = 'openvz_stop_vm';
+
+ $tmp = $app->db->queryOneRecord("SELECT count(action_id) as actions FROM sys_remoteaction
+ WHERE server_id = '".$vm['server_id']."'
+ AND action_type = '$action'
+ AND action_param = '".$vm['veid']."'
+ AND action_state = 'pending'");
+
+ if($tmp['actions'] > 0) {
+ $this->server->fault('action_pending', 'There is already a action pending for this VM.');
+ return false;
+ } else {
+ $sql = "INSERT INTO sys_remoteaction (server_id, tstamp, action_type, action_param, action_state, response) " .
+ "VALUES (".
+ (int)$vm['server_id'] . ", ".
+ time() . ", ".
+ "'".$action."', ".
+ $vm['veid'].", ".
+ "'pending', ".
+ "''".
+ ")";
+ $app->db->query($sql);
+ }
+ }
+ //* Restart VM
+ public function openvz_vm_restart($session_id, $vm_id)
+ {
+ global $app;
+
+ if(!$this->checkPerm($session_id, 'vm_openvz')) {
+ $this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+ return false;
+ }
+
+ $app->uses('remoting_lib');
+ $app->remoting_lib->loadFormDef('../vm/form/openvz_vm.tform.php');
+ $vm = $app->remoting_lib->getDataRecord($vm_id);
+
+ if(!is_array($vm)) {
+ $this->server->fault('action_pending', 'No VM with this ID available.');
+ return false;
+ }
+
+ if($vm['active'] == 'n') {
+ $this->server->fault('action_pending', 'VM is not in active state.');
+ return false;
+ }
+
+ $action = 'openvz_restart_vm';
+
+ $tmp = $app->db->queryOneRecord("SELECT count(action_id) as actions FROM sys_remoteaction
+ WHERE server_id = '".$vm['server_id']."'
+ AND action_type = '$action'
+ AND action_param = '".$vm['veid']."'
+ AND action_state = 'pending'");
+
+ if($tmp['actions'] > 0) {
+ $this->server->fault('action_pending', 'There is already a action pending for this VM.');
+ return false;
+ } else {
+ $sql = "INSERT INTO sys_remoteaction (server_id, tstamp, action_type, action_param, action_state, response) " .
+ "VALUES (".
+ (int)$vm['server_id'] . ", ".
+ time() . ", ".
+ "'".$action."', ".
+ $vm['veid'].", ".
+ "'pending', ".
+ "''".
+ ")";
+ $app->db->query($sql);
+ }
+ }
--
Gitblit v1.9.1