From 8b5ccd302bd1497de721a25e4ce086bebf95173f Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 08 Jun 2008 15:32:42 -0400
Subject: [PATCH] Fixed a problem with the logout when the php session has ended.
---
interface/lib/classes/remoting.inc.php | 219 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 185 insertions(+), 34 deletions(-)
diff --git a/interface/lib/classes/remoting.inc.php b/interface/lib/classes/remoting.inc.php
index 362559b..c9ec53b 100644
--- a/interface/lib/classes/remoting.inc.php
+++ b/interface/lib/classes/remoting.inc.php
@@ -5,18 +5,38 @@
//* remote session timeout in seconds
private $session_timeout = 600;
+ private $server;
+
+ /*
+ These variables shall stay global.
+ Please do not make them private variables.
+
+ private $app;
+ private $conf;
+ */
+
+ public function __construct()
+ {
+ global $server;
+ $this->server = $server;
+ /*
+ $this->app = $app;
+ $this->conf = $conf;
+ */
+ }
+
//* remote login function
public function login($username, $password)
{
global $app, $conf, $server;
if(empty($username)) {
- $server->fault('login_username_empty', 'The login username is empty');
+ $this->server->fault('login_username_empty', 'The login username is empty');
return false;
}
if(empty($password)) {
- $server->fault('login_password_empty', 'The login password is empty');
+ $this->server->fault('login_password_empty', 'The login password is empty');
return false;
}
@@ -32,24 +52,25 @@
$remote_userid = $remote_user['remote_userid'];
$remote_functions = $remote_user['remote_functions'];
$tstamp = time() + $this->session_timeout;
- $sql = "INSERT INTO remote_session (remote_session,remote_userid,remote_functions,tstamp) VALUES ('$remote_session',$remote_userid,'$remote_functions',$tstamp)";
+ $sql = 'INSERT INTO remote_session (remote_session,remote_userid,remote_functions,tstamp'
+ .') VALUES ('
+ ." '$remote_session',$remote_userid,'$remote_functions',$tstamp)";
$app->db->query($sql);
return $remote_session;
} else {
- $server->fault('login_failed', 'The login failed. Username or password wrong.');
+ $this->server->fault('login_failed', 'The login failed. Username or password wrong.');
return false;
}
}
-
//* remote logout function
public function logout($session_id)
- {
- global $app, $conf, $server;
+ {
+ global $app;
if(empty($session_id)) {
- $server->fault('session_id_empty', 'The SessionID is empty.');
+ $this->server->fault('session_id_empty', 'The SessionID is empty.');
return false;
}
@@ -57,40 +78,170 @@
$sql = "DELETE FROM remote_session WHERE remote_session = '$session_id'";
$app->db->query($sql);
- if($app->db->affectedRows() == 1) {
- return true;
- } else {
- return false;
- }
+ return ($app->db->affectedRows() == 1);
}
- public function mail_domain_add($session_id, $params)
+ //* Get mail domain details
+ public function mail_domain_get($session_id, $domain_id)
{
- global $app, $conf, $server;
-
- if(!$this->checkPerm($session_id, 'mail_domain_add')) {
- $server->fault('permission_denied','You do not have the permissions to access this function.');
+ if(!$this->checkPerm($session_id, 'mail_domain_get')) {
+ $this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
return false;
}
-
- //* Form definition file, that is used for this table in the interafce
- $formdef = '../mail/form/mail_domain.tform.php';
-
- //* check the variables against the form definition and build the sql query automatically.
- // I will use a modified version of the tform class for this.
-
-
-
-
+ $app->uses('remoting_lib');
+ $app->remoting_lib->loadFormDef('../mail/form/mail_domain.tform.php');
+ return $app->remoting_lib->getDataRecord($domain_id);
+ }
+
+ //* Add a mail domain
+ public function mail_domain_add($session_id, $client_id, $params)
+ {
+ if(!$this->checkPerm($session_id, 'mail_domain_add')) {
+ $this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+ return false;
+ }
+ $domain_id = $this->insertQuery('../mail/form/mail_domain.tform.php',$client_id,$params);
+ return $domain_id;
+ }
+
+ //* Update a mail domain
+ public function mail_domain_update($session_id, $client_id, $domain_id, $params)
+ {
+ if(!$this->checkPerm($session_id, 'mail_domain_update')) {
+ $this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+ return false;
+ }
+ $affected_rows = $this->updateQuery('../mail/form/mail_domain.tform.php',$client_id,$domain_id,$params);
+ return $affected_rows;
+ }
+
+ //* Delete a mail domain
+ public function mail_domain_delete($session_id, $domain_id)
+ {
+ if(!$this->checkPerm($session_id, 'mail_domain_delete')) {
+ $this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+ return false;
+ }
+ $affected_rows = $this->updateQuery('../mail/form/mail_domain.tform.php',$domain_id);
+ return $affected_rows;
}
//** private functions -----------------------------------------------------------------------------------
- private function updateQuery($formdef, $params)
- {
+ private function insertQuery($formdef_file, $client_id, $params)
+ {
+ global $app;
+
+ $app->uses('remoting_lib');
+
+ //* Load the form definition
+ $app->remoting_lib->loadFormDef($formdef_file);
+
+ //* load the user profile of the client
+ $app->remoting_lib->loadUserProfile($client_id);
+
+ //* Get the SQL query
+ $sql = $app->remoting_lib->getSQL($params,'INSERT',0);
+ if($app->remoting_lib->errorMessage != '') {
+ $this->server->fault('data_processing_error', $app->remoting_lib->errorMessage);
+ return false;
+ }
+
+ $app->db->query($sql);
+
+ if($app->db->errorMessage != '') {
+ $this->server->fault('database_error', $app->db->errorMessage . ' '.$sql);
+ return false;
+ }
+
+ $insert_id = $app->db->insertID();
+
+ //* Save changes to Datalog
+ if($app->remoting_lib->formDef["db_history"] == 'yes') {
+ $new_rec = $app->remoting_lib->getDataRecord($insert_id);
+ $app->tform->datalogSave('INSERT',$primary_id,array(),$new_rec);
+ }
+
+
+
+
+ return $insert_id;
+ }
+
+
+ private function updateQuery($formdef_file, $client_id, $primary_id, $params)
+ {
+ global $app;
+
+ $app->uses('remoting_lib');
+
+ //* Load the form definition
+ $app->remoting_lib->loadFormDef($formdef_file);
+
+ //* load the user profile of the client
+ $app->remoting_lib->loadUserProfile($client_id);
+
+ //* Get the SQL query
+ $sql = $app->remoting_lib->getSQL($params,'UPDATE',$primary_id);
+ if($app->remoting_lib->errorMessage != '') {
+ $this->server->fault('data_processing_error', $app->remoting_lib->errorMessage);
+ return false;
+ }
+
+ $old_rec = $app->remoting_lib->getDataRecord($primary_id);
+
+ $app->db->query($sql);
+
+ if($app->db->errorMessage != '') {
+ $this->server->fault('database_error', $app->db->errorMessage . ' '.$sql);
+ return false;
+ }
+
+ $affected_rows = $app->db->affectedRows();
+
+ //* Save changes to Datalog
+ if($app->remoting_lib->formDef["db_history"] == 'yes') {
+ $new_rec = $app->remoting_lib->getDataRecord($primary_id);
+ $app->tform->datalogSave('UPDATE',$primary_id,$old_rec,$new_rec);
+ }
+
+
+
+ return $affected_rows;
+ }
+
+ private function deleteQuery($formdef_file, $primary_id)
+ {
+ global $app;
+
+ $app->uses('remoting_lib');
+
+ //* Load the form definition
+ $app->remoting_lib->loadFormDef($formdef_file);
+
+ //* Get the SQL query
+ $sql = $app->remoting_lib->getDeleteSQL($primary_id);
+
+ $app->db->query($sql);
+
+ if($app->db->errorMessage != '') {
+ $this->server->fault('database_error', $app->db->errorMessage . ' '.$sql);
+ return false;
+ }
+
+ $affected_rows = $app->db->affectedRows();
+
+ //* Save changes to Datalog
+ if($app->remoting_lib->formDef["db_history"] == 'yes') {
+ $rec = $app->remoting_lib->getDataRecord($primary_id);
+ $app->tform->datalogSave('DELETE',$primary_id,$rec,array());
+ }
+
+
+ return $affected_rows;
}
@@ -105,11 +256,11 @@
private function getSession($session_id)
- {
- global $app, $conf, $server;
+ {
+ global $app;
if(empty($session_id)) {
- $server->fault('session_id_empty','The SessionID is empty.');
+ $this->server->fault('session_id_empty','The SessionID is empty.');
return false;
}
@@ -121,7 +272,7 @@
if($session['remote_userid'] > 0) {
return $session;
} else {
- $server->fault('session_does_not_exist','The Session is expired or does not exist.');
+ $this->server->fault('session_does_not_exist','The Session is expired or does not exist.');
return false;
}
}
--
Gitblit v1.9.1