From e615265d3b51e27f0f664cea193b6353975d6f7d Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 29 Aug 2011 04:25:44 -0400
Subject: [PATCH] Fixed php notice in session library.
---
interface/lib/classes/remoting.inc.php | 49 +++++++++++++++++++++++++++++++++++++------------
1 files changed, 37 insertions(+), 12 deletions(-)
diff --git a/interface/lib/classes/remoting.inc.php b/interface/lib/classes/remoting.inc.php
index 53ee957..8684a2a 100644
--- a/interface/lib/classes/remoting.inc.php
+++ b/interface/lib/classes/remoting.inc.php
@@ -2107,12 +2107,12 @@
- //** private functions -----------------------------------------------------------------------------------
+ //** protected functions -----------------------------------------------------------------------------------
- private function klientadd($formdef_file, $reseller_id, $params)
+ protected function klientadd($formdef_file, $reseller_id, $params)
{
global $app, $tform, $remoting_lib;
$app->uses('remoting_lib');
@@ -2127,28 +2127,33 @@
if(isset($params['template_master']) and $params['template_master'] > 0)
{
$template=$app->db->queryOneRecord("SELECT * FROM client_template WHERE template_id=".intval($params['template_master']));
- $params=array_merge($params,$template);
+ if(is_array($template)) $params=array_merge($params,$template);
}
//* 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') {
@@ -2167,7 +2172,7 @@
return $insert_id;
}
- private function insertQuery($formdef_file, $client_id, $params,$event_identifier = '')
+ protected function insertQuery($formdef_file, $client_id, $params,$event_identifier = '')
{
global $app, $tform, $remoting_lib;
@@ -2211,7 +2216,7 @@
}
- private function updateQuery($formdef_file, $client_id, $primary_id, $params, $event_identifier = '')
+ protected function updateQuery($formdef_file, $client_id, $primary_id, $params, $event_identifier = '')
{
global $app;
@@ -2257,7 +2262,7 @@
return $affected_rows;
}
- private function deleteQuery($formdef_file, $primary_id, $event_identifier = '')
+ protected function deleteQuery($formdef_file, $primary_id, $event_identifier = '')
{
global $app;
@@ -2301,7 +2306,7 @@
}
- private function checkPerm($session_id, $function_name)
+ protected function checkPerm($session_id, $function_name)
{
$dobre=array();
$session = $this->getSession($session_id);
@@ -2314,7 +2319,7 @@
}
- private function getSession($session_id)
+ protected function getSession($session_id)
{
global $app;
@@ -2793,6 +2798,26 @@
return $app->remoting_lib->getDataRecord($vm_id);
}
+ //* Get OpenVZ list
+ public function openvz_vm_get_by_client($session_id, $client_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;
+ }
+
+ if (!empty($client_id)) {
+ $client_id = intval($client_id);
+ $tmp = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = $client_id");
+ $sql = "SELECT * FROM openvz_vm WHERE sys_groupid = ".intval($tmp['groupid']);
+ $result = $app->db->queryAllRecords($sql);
+ return $result;
+ }
+ return false;
+ }
+
//* Add a openvz vm record
public function openvz_vm_add($session_id, $client_id, $params)
{
--
Gitblit v1.9.1