From e631410a14d68c6c54242cf833c0de9c79bc09dd Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 21 Jul 2010 11:41:48 -0400
Subject: [PATCH] Fixed: FS#1220 - /var/vmail/(domain)/(user) directories and files not delete when mail_user is deleted via remote.

---
 interface/lib/classes/remoting.inc.php | 1247 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 1,142 insertions(+), 105 deletions(-)

diff --git a/interface/lib/classes/remoting.inc.php b/interface/lib/classes/remoting.inc.php
index 07b28f3..6ae0d16 100644
--- a/interface/lib/classes/remoting.inc.php
+++ b/interface/lib/classes/remoting.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
-Copyright (c) 2007, Till Brehm, projektfarm Gmbh
+Copyright (c) 2007 - 2009, Till Brehm, projektfarm Gmbh
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -40,6 +40,9 @@
 	private $session_timeout = 600;
 	
 	private $server;
+	public $oldDataRecord;
+	public $dataRecord;
+	public $id;
 	
 	/*
 	These variables shall stay global. 
@@ -119,8 +122,31 @@
         return ($app->db->affectedRows() == 1);
 	}
 	
+	// Get server details
+        /**
+        Gets the server configuration
+        @param int session id
+        @param int server id
+        @param string  section of the config field in the server table. Could be 'web', 'dns', 'mail', 'dns', 'cron', etc
+        @author Julio Montoya <gugli100@gmail.com>
+        */
+    public function server_get($session_id, $server_id, $section ='') {
+        global $app;        
+        if(!$this->checkPerm($session_id, 'server_get')) {
+            $this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+            return false;
+        }
+        if (!empty($session_id) && !empty($server_id)) {    
+            $app->uses('remoting_lib , getconf');        
+            $section_config =  $app->getconf->get_server_config($server_id,$section);        
+            return $section_config;
+        } else {
+            return false;
+        }
+    }
+	
 	//* Get mail domain details
-	public function mail_domain_get($session_id, $domain_id)
+	public function mail_domain_get($session_id, $primary_id)
     {
 		global $app;
 		
@@ -130,7 +156,7 @@
 		}
 		$app->uses('remoting_lib');
 		$app->remoting_lib->loadFormDef('../mail/form/mail_domain.tform.php');
-		return $app->remoting_lib->getDataRecord($domain_id);
+		return $app->remoting_lib->getDataRecord($primary_id);
 	}
 	
 	//* Add a mail domain
@@ -140,29 +166,29 @@
 			$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;
+		$primary_id = $this->insertQuery('../mail/form/mail_domain.tform.php',$client_id,$params);
+		return $primary_id;
 	}
 	
 	//* Update a mail domain
-	public function mail_domain_update($session_id, $client_id, $domain_id, $params)
+	public function mail_domain_update($session_id, $client_id, $primary_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);
+		$affected_rows = $this->updateQuery('../mail/form/mail_domain.tform.php', $client_id, $primary_id, $params);
 		return $affected_rows;
 	}
 	
 	//* Delete a mail domain
-	public function mail_domain_delete($session_id, $domain_id)
+	public function mail_domain_delete($session_id, $primary_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->deleteQuery('../mail/form/mail_domain.tform.php',$domain_id);
+		$affected_rows = $this->deleteQuery('../mail/form/mail_domain.tform.php', $primary_id);
 		return $affected_rows;
 	}
 	
@@ -182,37 +208,37 @@
 	
 	
 	//* dodanie uzytkownika email
-	public function mail_user_add($session_id,$domain_id, $client_id, $params){
+	public function mail_user_add($session_id, $client_id, $params){
 		if (!$this->checkPerm($session_id, 'mail_user_add')){
 			$this->server->fault('permission_denied','You do not have the permissions to access this function.');
 			return false;
 		}
-		$affected_rows = $this->insertQuery('../mail/form/mail_user.tform.php',$domain_id, $client_id, $params);
+		$affected_rows = $this->insertQuery('../mail/form/mail_user.tform.php', $client_id, $params);
 		return $affected_rows;
 	}
 
 	//* edycja uzytkownika email	
-	public function mail_user_update($session_id, $client_id, $domain_id, $params)
+	public function mail_user_update($session_id, $client_id, $primary_id, $params)
 	{
 		if (!$this->checkPerm($session_id, 'mail_user_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_user.tform.php', $client_id, $domain_id, $params);
+		$affected_rows = $this->updateQuery('../mail/form/mail_user.tform.php', $client_id, $primary_id, $params);
 		return $affected_rows;
 	}
 
 	
 	//*usuniecie uzytkownika emial
-	public function mail_user_delete($session_id,$domain_id)
+	public function mail_user_delete($session_id, $primary_id)
 	{
 		if (!$this->checkPerm($session_id, 'mail_user_delete'))
 		{
 			$this->server->fault('permission_denied','You do not have the permissions to access this function.');
 			return false;
 		}
-		$affected_rows = $this->deleteQuery('../mail/form/mail_user.tform.php',$domain_id);
+		$affected_rows = $this->deleteQuery('../mail/form/mail_user.tform.php', $primary_id);
 		return $affected_rows;
 	}
 	
@@ -232,33 +258,39 @@
 	
 	public function mail_user_filter_add($session_id, $client_id, $params)
 	{
+		global $app;
 		if (!$this->checkPerm($session_id, 'mail_user_filter_add')){
 			$this->server->fault('permission_denied','You do not have the permissions to access this function.');
 			return false;
 		}
 		$affected_rows = $this->insertQuery('../mail/form/mail_user_filter.tform.php', $client_id, $params);
+		$app->plugin->raiseEvent('mail:mail_user_filter:on_after_insert',$this);
 		return $affected_rows;
 	}
 
 	public function mail_user_filter_update($session_id, $client_id, $primary_id, $params)
 	{
+		global $app;
 		if (!$this->checkPerm($session_id, 'mail_user_filter_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_user_filter.tform.php', $client_id, $primary_id, $params);
+		$app->plugin->raiseEvent('mail:mail_user_filter:on_after_update',$this);
 		return $affected_rows;
 	}
 
-	public function mail_user_filter_delete($session_id,$domain_id)
+	public function mail_user_filter_delete($session_id, $primary_id)
 	{
+		global $app;
 		if (!$this->checkPerm($session_id, 'mail_user_filter_delete'))
 		{
 			$this->server->fault('permission_denied','You do not have the permissions to access this function.');
 			return false;
 		}
-		$affected_rows = $this->deleteQuery('../mail/form/mail_user_filter.tform.php',$domain_id);
+		$affected_rows = $this->deleteQuery('../mail/form/mail_user_filter.tform.php', $primary_id);
+		$app->plugin->raiseEvent('mail:mail_user_filter:on_after_delete',$this);
 		return $affected_rows;
 	}
 
@@ -277,37 +309,37 @@
 	}
 	
 	//* aliasy email
-	public function mail_alias_add($session_id,$domain_id, $client_id, $params)
+	public function mail_alias_add($session_id, $client_id, $params)
 	{
 		if (!$this->checkPerm($session_id, 'mail_alias_add'))
 		{
 			$this->server->fault('permission_denied','You do not have the permissions to access this function.');
 			return false;
 		}
-		$affected_rows = $this->insertQuery('../mail/form/mail_alias.tform.php', $domain_id,  $client_id, $params);
+		$affected_rows = $this->insertQuery('../mail/form/mail_alias.tform.php', $client_id, $params);
 		return $affected_rows;
 	}
 
 
-	public function mail_alias_update($session_id, $domain_id, $client_id, $params)
+	public function mail_alias_update($session_id, $client_id, $primary_id, $params)
 	{
 			if (!$this->checkPerm($session_id, 'mail_alias_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_alias.tform.php', $client_id, $domain_id, $params);
+			$affected_rows = $this->updateQuery('../mail/form/mail_alias.tform.php', $client_id, $primary_id, $params);
 			return $affected_rows;
 	}
 
-	public function mail_alias_delete($session_id,$domain_id)
+	public function mail_alias_delete($session_id, $primary_id)
 	{
 			if (!$this->checkPerm($session_id, 'mail_alias_delete'))
 			{
 					$this->server->fault('permission_denied','You do not have the permissions to access this function.');
 					return false;
 			}
-			$affected_rows = $this->deleteQuery('../mail/form/mail_alias.tform.php',$domain_id);
+			$affected_rows = $this->deleteQuery('../mail/form/mail_alias.tform.php', $primary_id);
 			return $affected_rows;
 	}
 	
@@ -326,38 +358,38 @@
 	}
 	
  	//* przekierowania email
-	public function mail_forward_add($session_id,$domain_id, $client_id, $params)
+	public function mail_forward_add($session_id, $client_id, $params)
 	{
 			if (!$this->checkPerm($session_id, 'mail_forward_add'))
 			{
 					$this->server->fault('permission_denied','You do not have the permissions to access this function.');
 					return false;
 			}
-			$affected_rows = $this->insertQuery('../mail/form/mail_forward.tform.php', $domain_id,  $client_id, $params);
+			$affected_rows = $this->insertQuery('../mail/form/mail_forward.tform.php', $client_id, $params);
 			return $affected_rows;
 	}
 
 
-	public function mail_forward_update($session_id, $domain_id, $client_id, $params)
+	public function mail_forward_update($session_id, $client_id, $primary_id, $params)
 	{
 			if (!$this->checkPerm($session_id, 'mail_forward_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_forward.tform.php', $client_id, $domain_id, $params);
+			$affected_rows = $this->updateQuery('../mail/form/mail_forward.tform.php', $client_id, $primary_id, $params);
 			return $affected_rows;
 	}
 
 
-	public function mail_forward_delete($session_id,$domain_id)
+	public function mail_forward_delete($session_id, $primary_id)
 	{
 			if (!$this->checkPerm($session_id, 'mail_forward_delete'))
 			{
 					$this->server->fault('permission_denied','You do not have the permissions to access this function.');
 					return false;
 			}
-			$affected_rows = $this->deleteQuery('../mail/form/mail_forward.tform.php',$domain_id);
+			$affected_rows = $this->deleteQuery('../mail/form/mail_forward.tform.php', $primary_id);
 			return $affected_rows;
 	}
 	
@@ -376,36 +408,36 @@
 	}
 
 	//* catchall e-mail
- 	public function mail_catchall_add($session_id,$domain_id, $client_id, $params)
+ 	public function mail_catchall_add($session_id, $client_id, $params)
 	{
 			if (!$this->checkPerm($session_id, 'mail_catchall_add'))
 			{
 					$this->server->fault('permission_denied','You do not have the permissions to access this function.');
 					return false;
 			}
-			$affected_rows = $this->insertQuery('../mail/form/mail_domain_catchall.tform.php', $domain_id,  $client_id, $params);
+			$affected_rows = $this->insertQuery('../mail/form/mail_domain_catchall.tform.php', $client_id, $params);
 			return $affected_rows;
 	}
 
-	public function mail_catchall_update($session_id, $domain_id, $client_id, $params)
+	public function mail_catchall_update($session_id, $client_id, $primary_id, $params)
 	{
 			if (!$this->checkPerm($session_id, 'mail_catchall_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_catchall.tform.php', $client_id, $domain_id, $params);
+			$affected_rows = $this->updateQuery('../mail/form/mail_domain_catchall.tform.php', $client_id, $primary_id, $params);
 			return $affected_rows;
 	}
 
-	public function mail_catchall_delete($session_id,$domain_id)
+	public function mail_catchall_delete($session_id, $primary_id)
 	{
 			if (!$this->checkPerm($session_id, 'mail_catchall_delete'))
 			{
 					$this->server->fault('permission_denied','You do not have the permissions to access this function.');
 					return false;
 			}
-			$affected_rows = $this->deleteQuery('../mail/form/mail_domain_catchall.tform.php',$domain_id);
+			$affected_rows = $this->deleteQuery('../mail/form/mail_domain_catchall.tform.php', $primary_id);
 			return $affected_rows;
 	}
 	
@@ -424,38 +456,38 @@
 	}
 	
 	//* przeniesienia e-mail
-	public function mail_transport_add($session_id,$domain_id, $client_id, $params)
+	public function mail_transport_add($session_id, $client_id, $params)
 	{
 			if (!$this->checkPerm($session_id, 'mail_transport_add'))
 			{
 					$this->server->fault('permission_denied','You do not have the permissions to access this function.');
 					return false;
 			}
-			$affected_rows = $this->insertQuery('../mail/form/mail_transport.tform.php', $domain_id,  $client_id, $params);
+			$affected_rows = $this->insertQuery('../mail/form/mail_transport.tform.php', $client_id, $params);
 			return $affected_rows;
 	}
 
 
-	public function mail_transport_update($session_id, $domain_id, $client_id, $params)
+	public function mail_transport_update($session_id, $client_id, $primary_id, $params)
 	{
 			if (!$this->checkPerm($session_id, 'mail_transport_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_transport.tform.php', $client_id, $domain_id, $params);
+			$affected_rows = $this->updateQuery('../mail/form/mail_transport.tform.php', $client_id, $primary_id, $params);
 			return $affected_rows;
 	}
 
 
-	public function mail_transport_delete($session_id,$domain_id)
+	public function mail_transport_delete($session_id, $primary_id)
 	{
 			if (!$this->checkPerm($session_id, 'mail_transport_delete'))
 			{
 					$this->server->fault('permission_denied','You do not have the permissions to access this function.');
 					return false;
 			}
-			$affected_rows = $this->deleteQuery('../mail/form/mail_transport.tform.php',$domain_id);
+			$affected_rows = $this->deleteQuery('../mail/form/mail_transport.tform.php', $primary_id);
 			return $affected_rows;
 	}
 	
@@ -474,38 +506,38 @@
 	}
 
  	//* biała lista e-mail
-	public function mail_spamfilter_whitelist_add($session_id,$domain_id, $client_id, $params)
+	public function mail_spamfilter_whitelist_add($session_id, $client_id, $params)
 	{
 			if (!$this->checkPerm($session_id, 'mail_spamfilter_whitelist_add'))
 			{
 					$this->server->fault('permission_denied','You do not have the permissions to access this function.');
 					return false;
 			}
-			$affected_rows = $this->insertQuery('../mail/form/spamfilter_whitelist.tform.php', $domain_id,  $client_id, $params);
+			$affected_rows = $this->insertQuery('../mail/form/spamfilter_whitelist.tform.php', $client_id, $params);
 			return $affected_rows;
 	}
 
 
-	public function mail_spamfilter_whitelist_update($session_id, $domain_id, $client_id, $params)
+	public function mail_spamfilter_whitelist_update($session_id, $client_id, $primary_id, $params)
 	{
 			if (!$this->checkPerm($session_id, 'mail_spamfilter_whitelist_update'))
 			{
 					$this->server->fault('permission_denied','You do not have the permissions to access this function.');
 					return false;
 			}
-			$affected_rows = $this->updateQuery('../mail/form/spamfilter_whitelist.tform.php', $client_id, $domain_id, $params);
+			$affected_rows = $this->updateQuery('../mail/form/spamfilter_whitelist.tform.php', $client_id, $primary_id, $params);
 			return $affected_rows;
 	}
 
 
-	public function mail_spamfilter_whitelist_delete($session_id,$domain_id)
+	public function mail_spamfilter_whitelist_delete($session_id, $primary_id)
 	{
 			if (!$this->checkPerm($session_id, 'mail_spamfilter_whitelist_delete'))
 			{
 					$this->server->fault('permission_denied','You do not have the permissions to access this function.');
 					return false;
 			}
-			$affected_rows = $this->deleteQuery('../mail/form/spamfilter_whitelist.tform.php',$domain_id);
+			$affected_rows = $this->deleteQuery('../mail/form/spamfilter_whitelist.tform.php', $primary_id);
 			return $affected_rows;
 	}
 	
@@ -524,38 +556,38 @@
 	}
 	
  	//* czarna lista e-mail
-	public function mail_spamfilter_blacklist_add($session_id,$domain_id, $client_id, $params)
+	public function mail_spamfilter_blacklist_add($session_id, $client_id, $params)
 	{
 			if (!$this->checkPerm($session_id, 'mail_spamfilter_blacklist_add'))
 			{
 					$this->server->fault('permission_denied','You do not have the permissions to access this function.');
 					return false;
 			}
-			$affected_rows = $this->insertQuery('../mail/form/spamfilter_blacklist.tform.php', $domain_id,  $client_id, $params);
+			$affected_rows = $this->insertQuery('../mail/form/spamfilter_blacklist.tform.php', $client_id, $params);
 			return $affected_rows;
 	}
 
 
-	public function mail_spamfilter_blacklist_update($session_id, $domain_id, $client_id, $params)
+	public function mail_spamfilter_blacklist_update($session_id, $client_id, $primary_id, $params)
 	{
 			if (!$this->checkPerm($session_id, 'mail_spamfilter_blacklist_update'))
 			{
 					$this->server->fault('permission_denied','You do not have the permissions to access this function.');
 					return false;
 			}
-			$affected_rows = $this->updateQuery('../mail/form/spamfilter_blacklist.tform.php', $client_id, $domain_id, $params);
+			$affected_rows = $this->updateQuery('../mail/form/spamfilter_blacklist.tform.php', $client_id, $primary_id, $params);
 			return $affected_rows;
 	}
 
 
-	public function mail_spamfilter_blacklist_delete($session_id,$domain_id)
+	public function mail_spamfilter_blacklist_delete($session_id, $primary_id)
 	{
 			if (!$this->checkPerm($session_id, 'mail_spamfilter_blacklist_delete'))
 			{
 					$this->server->fault('permission_denied','You do not have the permissions to access this function.');
 					return false;
 			}
-			$affected_rows = $this->deleteQuery('../mail/form/spamfilter_blacklist.tform.php',$domain_id);
+			$affected_rows = $this->deleteQuery('../mail/form/spamfilter_blacklist.tform.php', $primary_id);
 			return $affected_rows;
 	}
 	
@@ -574,38 +606,38 @@
 	}
 
 	//* filtr spamu użytkowników e-mail
-	public function mail_spamfilter_user_add($session_id,$domain_id, $client_id, $params)
+	public function mail_spamfilter_user_add($session_id, $client_id, $params)
 	{
 			if (!$this->checkPerm($session_id, 'mail_spamfilter_user_add'))
 			{
 					$this->server->fault('permission_denied','You do not have the permissions to access this function.');
 					return false;
 			}
-			$affected_rows = $this->insertQuery('../mail/form/spamfilter_users.tform.php', $domain_id,  $client_id, $params);
+			$affected_rows = $this->insertQuery('../mail/form/spamfilter_users.tform.php', $client_id, $params);
 			return $affected_rows;
 	}
 
 
-	public function mail_spamfilter_user_update($session_id, $domain_id, $client_id, $params)
+	public function mail_spamfilter_user_update($session_id, $client_id, $primary_id, $params)
 	{
 			if (!$this->checkPerm($session_id, 'mail_spamfilter_user_update'))
 			{
 					$this->server->fault('permission_denied','You do not have the permissions to access this function.');
 					return false;
 			}
-			$affected_rows = $this->updateQuery('../mail/form/spamfilter_users.tform.php', $client_id, $domain_id, $params);
+			$affected_rows = $this->updateQuery('../mail/form/spamfilter_users.tform.php', $client_id, $primary_id, $params);
 			return $affected_rows;
 	}
 
 
-	public function mail_spamfilter_user_delete($session_id,$domain_id)
+	public function mail_spamfilter_user_delete($session_id, $primary_id)
 	{
 			if (!$this->checkPerm($session_id, 'mail_spamfilter_user_delete'))
 			{
 					$this->server->fault('permission_denied','You do not have the permissions to access this function.');
 					return false;
 			}
-			$affected_rows = $this->deleteQuery('../mail/form/spamfilter_users.tform.php',$domain_id);
+			$affected_rows = $this->deleteQuery('../mail/form/spamfilter_users.tform.php', $primary_id);
 			return $affected_rows;
 	}
 	
@@ -624,38 +656,38 @@
 	}
 	
  	//* polityki filtrów spamu e-mail
-	public function mail_policy_add($session_id,$domain_id, $client_id, $params)
+	public function mail_policy_add($session_id, $client_id, $params)
 	{
 			if (!$this->checkPerm($session_id, 'mail_policy_add'))
 			{
 					$this->server->fault('permission_denied','You do not have the permissions to access this function.');
 					return false;
 			}
-			$affected_rows = $this->insertQuery('../mail/form/spamfilter_policy.tform.php', $domain_id,  $client_id, $params);
+			$affected_rows = $this->insertQuery('../mail/form/spamfilter_policy.tform.php', $client_id, $params);
 			return $affected_rows;
 	}
 
 
-	public function mail_policy_update($session_id, $domain_id, $client_id, $params)
+	public function mail_policy_update($session_id, $client_id, $primary_id, $params)
 	{
 			if (!$this->checkPerm($session_id, 'mail_policy_update'))
 			{
 					$this->server->fault('permission_denied','You do not have the permissions to access this function.');
 					return false;
 			}
-			$affected_rows = $this->updateQuery('../mail/form/spamfilter_policy.tform.php', $client_id, $domain_id, $params);
+			$affected_rows = $this->updateQuery('../mail/form/spamfilter_policy.tform.php', $client_id, $primary_id, $params);
 			return $affected_rows;
 	}
 
 
-	public function mail_policy_delete($session_id,$domain_id)
+	public function mail_policy_delete($session_id, $primary_id)
 	{
 			if (!$this->checkPerm($session_id, 'mail_policy_delete'))
 			{
 					$this->server->fault('permission_denied','You do not have the permissions to access this function.');
 					return false;
 			}
-			$affected_rows = $this->deleteQuery('../mail/form/spamfilter_policy.tform.php',$domain_id);
+			$affected_rows = $this->deleteQuery('../mail/form/spamfilter_policy.tform.php', $primary_id);
 			return $affected_rows;
 	}
 	
@@ -674,38 +706,38 @@
 	}
 
 	 //* fetchmail
-	public function mail_fetchmail_add($session_id,$domain_id, $client_id, $params)
+	public function mail_fetchmail_add($session_id, $client_id, $params)
 	{
 			if (!$this->checkPerm($session_id, 'mail_fetchmail_add'))
 			{
 					$this->server->fault('permission_denied','You do not have the permissions to access this function.');
 					return false;
 			}
-			$affected_rows = $this->insertQuery('../mail/form/mail_get.tform.php', $domain_id,  $client_id, $params);
+			$affected_rows = $this->insertQuery('../mail/form/mail_get.tform.php', $client_id, $params);
 			return $affected_rows;
 	}
 
 
-	public function mail_fetchmail_update($session_id, $domain_id, $client_id, $params)
+	public function mail_fetchmail_update($session_id, $client_id, $primary_id, $params)
 	{
 			if (!$this->checkPerm($session_id, 'mail_fetchmail_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_get.tform.php', $client_id, $domain_id, $params);
+			$affected_rows = $this->updateQuery('../mail/form/mail_get.tform.php', $client_id, $primary_id, $params);
 			return $affected_rows;
 	}
 
 
-	public function mail_fetchmail_delete($session_id,$domain_id)
+	public function mail_fetchmail_delete($session_id, $primary_id)
 	{
 			if (!$this->checkPerm($session_id, 'mail_fetchmail_delete'))
 			{
 					$this->server->fault('permission_denied','You do not have the permissions to access this function.');
 					return false;
 			}
-			$affected_rows = $this->deleteQuery('../mail/form/mail_get.tform.php',$domain_id);
+			$affected_rows = $this->deleteQuery('../mail/form/mail_get.tform.php', $primary_id);
 			return $affected_rows;
 	}
 	
@@ -724,38 +756,38 @@
 	}
 	
 	//* wpisy białej listy
-	public function mail_whitelist_add($session_id,$domain_id, $client_id, $params)
+	public function mail_whitelist_add($session_id, $client_id, $params)
 	{
 			if (!$this->checkPerm($session_id, 'mail_whitelist_add'))
 			{
 					$this->server->fault('permission_denied','You do not have the permissions to access this function.');
 					return false;
 			}
-			$affected_rows = $this->insertQuery('../mail/form/mail_whitelist.tform.php', $domain_id,  $client_id, $params);
+			$affected_rows = $this->insertQuery('../mail/form/mail_whitelist.tform.php', $client_id, $params);
 			return $affected_rows;
 	}
 
 
-	public function mail_whitelist_update($session_id, $domain_id, $client_id, $params)
+	public function mail_whitelist_update($session_id, $client_id, $primary_id, $params)
 	{
 			if (!$this->checkPerm($session_id, 'mail_whitelist_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_whitelist.tform.php', $client_id, $domain_id, $params);
+			$affected_rows = $this->updateQuery('../mail/form/mail_whitelist.tform.php', $client_id, $primary_id, $params);
 			return $affected_rows;
 	}
 
 
-	public function mail_whitelist_delete($session_id,$domain_id)
+	public function mail_whitelist_delete($session_id, $primary_id)
 	{
 			if (!$this->checkPerm($session_id, 'mail_whitelist_delete'))
 			{
 					$this->server->fault('permission_denied','You do not have the permissions to access this function.');
 					return false;
 			}
-			$affected_rows = $this->deleteQuery('../mail/form/mail_whitelist.tform.php',$domain_id);
+			$affected_rows = $this->deleteQuery('../mail/form/mail_whitelist.tform.php', $primary_id);
 			return $affected_rows;
 	}
 	
@@ -774,38 +806,38 @@
 	}
 	
 	//* wpisy białej listy
-	public function mail_blacklist_add($session_id,$domain_id, $client_id, $params)
+	public function mail_blacklist_add($session_id, $client_id, $params)
 	{
 			if (!$this->checkPerm($session_id, 'mail_blacklist_add'))
 			{
 					$this->server->fault('permission_denied','You do not have the permissions to access this function.');
 					return false;
 			}
-			$affected_rows = $this->insertQuery('../mail/form/mail_blacklist.tform.php', $domain_id,  $client_id, $params);
+			$affected_rows = $this->insertQuery('../mail/form/mail_blacklist.tform.php', $client_id, $params);
 			return $affected_rows;
 	}
 
 
-	public function mail_blacklist_update($session_id, $domain_id, $client_id, $params)
+	public function mail_blacklist_update($session_id, $client_id, $primary_id, $params)
 	{
 			if (!$this->checkPerm($session_id, 'mail_blacklist_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_blacklist.tform.php', $client_id, $domain_id, $params);
+			$affected_rows = $this->updateQuery('../mail/form/mail_blacklist.tform.php', $client_id, $primary_id, $params);
 			return $affected_rows;
 	}
 
 
-	public function mail_blacklist_delete($session_id,$domain_id)
+	public function mail_blacklist_delete($session_id, $primary_id)
 	{
 			if (!$this->checkPerm($session_id, 'mail_blacklist_delete'))
 			{
 					$this->server->fault('permission_denied','You do not have the permissions to access this function.');
 					return false;
 			}
-			$affected_rows = $this->deleteQuery('../mail/form/mail_blacklist.tform.php',$domain_id);
+			$affected_rows = $this->deleteQuery('../mail/form/mail_blacklist.tform.php', $primary_id);
 			return $affected_rows;
 	}
 	
@@ -824,38 +856,38 @@
 	}
 
 	//* wpisy filtrow e-mail
-	public function mail_filter_add($session_id,$domain_id, $client_id, $params)
+	public function mail_filter_add($session_id, $client_id, $params)
 	{
 			if (!$this->checkPerm($session_id, 'mail_filter_add'))
 			{
 					$this->server->fault('permission_denied','You do not have the permissions to access this function.');
 					return false;
 			}
-			$affected_rows = $this->insertQuery('../mail/form/mail_content_filter.tform.php', $domain_id,  $client_id, $params);
+			$affected_rows = $this->insertQuery('../mail/form/mail_content_filter.tform.php', $client_id, $params);
 			return $affected_rows;
 	}
 
 
-	public function mail_filter_update($session_id, $domain_id, $client_id, $params)
+	public function mail_filter_update($session_id, $client_id, $primary_id, $params)
 	{
 			if (!$this->checkPerm($session_id, 'mail_filter_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_content_filter.tform.php', $client_id, $domain_id, $params);
+			$affected_rows = $this->updateQuery('../mail/form/mail_content_filter.tform.php', $client_id, $primary_id, $params);
 			return $affected_rows;
 	}
 
 
-	public function mail_filter_delete($session_id,$domain_id)
+	public function mail_filter_delete($session_id, $primary_id)
 	{
 			if (!$this->checkPerm($session_id, 'mail_filter_delete'))
 			{
 					$this->server->fault('permission_denied','You do not have the permissions to access this function.');
 					return false;
 			}
-			$affected_rows = $this->deleteQuery('../mail/form/mail_content_filter.tform.php',$domain_id);
+			$affected_rows = $this->deleteQuery('../mail/form/mail_content_filter.tform.php', $primary_id);
 			return $affected_rows;
 	}
 
@@ -866,24 +898,1012 @@
  * 
  * 
  * 
- * 	 * klient add :)
+ * 	 * Client functions
  * 
  * 
  */
-
-	public function client_add($session_id,$domain_id, $client_id, $params)
+	//* Get client details
+	public function client_get($session_id, $client_id)
+    {
+		global $app;
+		
+		if(!$this->checkPerm($session_id, 'client_get')) {
+			$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('../client/form/client.tform.php');
+		return $app->remoting_lib->getDataRecord($client_id);
+	}
+	
+	public function client_get_id($session_id, $sys_userid)
+    {
+		global $app;
+		if(!$this->checkPerm($session_id, 'client_get_id')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		
+		$sys_userid = intval($sys_userid);
+		
+		$rec = $app->db->queryOneRecord("SELECT client_id FROM sys_user WHERE userid = ".$sys_userid);
+		if(isset($rec['client_id'])) {
+			return intval($rec['client_id']);
+		} else {
+			$this->server->fault('no_client_found', 'There is no sysuser account for this client ID.');
+			return false;
+		}
+		
+	}
+	
+	
+	public function client_add($session_id, $reseller_id, $params)
 	{
 		if (!$this->checkPerm($session_id, 'client_add'))
 			{
 					$this->server->fault('permission_denied','You do not have the permissions to access this function.');
 					return false;
 			}
-		$affected_rows = $this->klientadd('../client/form/client.tform.php',$domain_id, $client_id, $params);
+		$affected_rows = $this->klientadd('../client/form/client.tform.php',$reseller_id, $params);
 		return $affected_rows;  
 				  
 	}
+	
+	public function client_update($session_id, $client_id, $reseller_id, $params)
+	{
+			global $app;
+			
+			if (!$this->checkPerm($session_id, 'client_update'))
+			{
+					$this->server->fault('permission_denied','You do not have the permissions to access this function.');
+					return false;
+			}
+			$affected_rows = $this->updateQuery('../client/form/client.tform.php', $client_id, $reseller_id, $params);
+			
+			$app->remoting_lib->ispconfig_sysuser_update($params,$client_id);
+			
+			return $affected_rows;
+	}
 
 
+	public function client_delete($session_id,$client_id)
+	{
+			global $app;
+			
+			if (!$this->checkPerm($session_id, 'client_delete'))
+			{
+					$this->server->fault('permission_denied','You do not have the permissions to access this function.');
+					return false;
+			}
+			$affected_rows = $this->deleteQuery('../client/form/client.tform.php',$client_id);
+			
+			$app->remoting_lib->ispconfig_sysuser_delete($client_id);
+			
+			return $affected_rows;
+	}
+	
+	// Website functions ---------------------------------------------------------------------------------------
+	
+	//* Get cron details
+	public function sites_cron_get($session_id, $cron_id)
+    {
+		global $app;
+		
+		if(!$this->checkPerm($session_id, 'sites_cron_get')) {
+			$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('../sites/form/cron.tform.php');
+		return $app->remoting_lib->getDataRecord($cron_id);
+	}
+	
+	//* Add a cron record
+	public function sites_cron_add($session_id, $client_id, $params)
+    {
+		if(!$this->checkPerm($session_id, 'sites_cron_add')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		return $this->insertQuery('../sites/form/cron.tform.php',$client_id,$params);
+	}
+	
+	//* Update cron record
+	public function sites_cron_update($session_id, $client_id, $cron_id, $params)
+    {
+		if(!$this->checkPerm($session_id, 'sites_cron_update')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->updateQuery('../sites/form/cron.tform.php',$client_id,$cron_id,$params);
+		return $affected_rows;
+	}
+	
+	//* Delete cron record
+	public function sites_cron_delete($session_id, $cron_id)
+    {
+		if(!$this->checkPerm($session_id, 'sites_cron_delete')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->deleteQuery('../sites/form/cron.tform.php',$cron_id);
+		return $affected_rows;
+	}
+	
+	// ----------------------------------------------------------------------------------------------------------
+	
+	//* Get record details
+	public function sites_database_get($session_id, $primary_id)
+    {
+		global $app;
+		
+		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;
+		}
+		$app->uses('remoting_lib');
+		$app->remoting_lib->loadFormDef('../sites/form/database.tform.php');
+		return $app->remoting_lib->getDataRecord($primary_id);
+	}
+	
+	//* Add a record
+	public function sites_database_add($session_id, $client_id, $params)
+    {
+		if(!$this->checkPerm($session_id, 'sites_database_add')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		return $this->insertQuery('../sites/form/database.tform.php',$client_id,$params);
+	}
+	
+	//* Update a record
+	public function sites_database_update($session_id, $client_id, $primary_id, $params)
+    {
+		if(!$this->checkPerm($session_id, 'sites_database_update')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->updateQuery('../sites/form/database.tform.php',$client_id,$primary_id,$params);
+		return $affected_rows;
+	}
+	
+	//* Delete a record
+	public function sites_database_delete($session_id, $primary_id)
+    {
+		if(!$this->checkPerm($session_id, 'sites_database_delete')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->deleteQuery('../sites/form/database.tform.php',$primary_id);
+		return $affected_rows;
+	}
+	
+	// ----------------------------------------------------------------------------------------------------------
+	
+	//* Get record details
+	public function sites_ftp_user_get($session_id, $primary_id)
+    {
+		global $app;
+		
+		if(!$this->checkPerm($session_id, 'sites_ftp_user_get')) {
+			$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('../sites/form/ftp_user.tform.php');
+		return $app->remoting_lib->getDataRecord($primary_id);
+	}
+	
+	//* Add a record
+	public function sites_ftp_user_add($session_id, $client_id, $params)
+    {
+		if(!$this->checkPerm($session_id, 'sites_ftp_user_add')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		return $this->insertQuery('../sites/form/ftp_user.tform.php',$client_id,$params);
+	}
+	
+	//* Update a record
+	public function sites_ftp_user_update($session_id, $client_id, $primary_id, $params)
+    {
+		if(!$this->checkPerm($session_id, 'sites_ftp_user_update')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->updateQuery('../sites/form/ftp_user.tform.php',$client_id,$primary_id,$params);
+		return $affected_rows;
+	}
+	
+	//* Delete a record
+	public function sites_ftp_user_delete($session_id, $primary_id)
+    {
+		if(!$this->checkPerm($session_id, 'sites_ftp_user_delete')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->deleteQuery('../sites/form/ftp_user.tform.php',$primary_id);
+		return $affected_rows;
+	}
+	
+	// ----------------------------------------------------------------------------------------------------------
+	
+	//* Get record details
+	public function sites_shell_user_get($session_id, $primary_id)
+    {
+		global $app;
+		
+		if(!$this->checkPerm($session_id, 'sites_shell_user_get')) {
+			$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('../sites/form/shell_user.tform.php');
+		return $app->remoting_lib->getDataRecord($primary_id);
+	}
+	
+	//* Add a record
+	public function sites_shell_user_add($session_id, $client_id, $params)
+    {
+		if(!$this->checkPerm($session_id, 'sites_shell_user_add')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		return $this->insertQuery('../sites/form/shell_user.tform.php',$client_id,$params);
+	}
+	
+	//* Update a record
+	public function sites_shell_user_update($session_id, $client_id, $primary_id, $params)
+    {
+		if(!$this->checkPerm($session_id, 'sites_shell_user_update')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->updateQuery('../sites/form/shell_user.tform.php',$client_id,$primary_id,$params);
+		return $affected_rows;
+	}
+	
+	//* Delete a record
+	public function sites_shell_user_delete($session_id, $primary_id)
+    {
+		if(!$this->checkPerm($session_id, 'sites_shell_user_delete')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->deleteQuery('../sites/form/shell_user.tform.php',$primary_id);
+		return $affected_rows;
+	}
+	
+	// ----------------------------------------------------------------------------------------------------------
+	
+	//* Get record details
+	public function sites_web_domain_get($session_id, $primary_id)
+    {
+		global $app;
+		
+		if(!$this->checkPerm($session_id, 'sites_web_domain_get')) {
+			$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('../sites/form/web_domain.tform.php');
+		return $app->remoting_lib->getDataRecord($primary_id);
+	}
+	
+	//* Add a record
+	public function sites_web_domain_add($session_id, $client_id, $params)
+    {
+		if(!$this->checkPerm($session_id, 'sites_web_domain_add')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		return $this->insertQuery('../sites/form/web_domain.tform.php',$client_id,$params);
+	}
+	
+	//* Update a record
+	public function sites_web_domain_update($session_id, $client_id, $primary_id, $params)
+    {
+		if(!$this->checkPerm($session_id, 'sites_web_domain_update')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->updateQuery('../sites/form/web_domain.tform.php',$client_id,$primary_id,$params);
+		return $affected_rows;
+	}
+	
+	//* Delete a record
+	public function sites_web_domain_delete($session_id, $primary_id)
+    {
+		if(!$this->checkPerm($session_id, 'sites_web_domain_delete')) {
+			$this->server->fault('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);
+		return $affected_rows;
+	}
+	
+	// -----------------------------------------------------------------------------------------------
+	
+	//* Get record details
+	public function sites_web_aliasdomain_get($session_id, $primary_id)
+    {
+		global $app;
+		
+		if(!$this->checkPerm($session_id, 'sites_web_aliasdomain_get')) {
+			$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('../sites/form/web_aliasdomain.tform.php');
+		return $app->remoting_lib->getDataRecord($primary_id);
+	}
+	
+	//* Add a record
+	public function sites_web_aliasdomain_add($session_id, $client_id, $params)
+    {
+		if(!$this->checkPerm($session_id, 'sites_web_aliasdomain_add')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		return $this->insertQuery('../sites/form/web_aliasdomain.tform.php',$client_id,$params);
+	}
+	
+	//* Update a record
+	public function sites_web_aliasdomain_update($session_id, $client_id, $primary_id, $params)
+    {
+		if(!$this->checkPerm($session_id, 'sites_web_aliasdomain_update')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->updateQuery('../sites/form/web_aliasdomain.tform.php',$client_id,$primary_id,$params);
+		return $affected_rows;
+	}
+	
+	//* Delete a record
+	public function sites_web_aliasdomain_delete($session_id, $primary_id)
+    {
+		if(!$this->checkPerm($session_id, 'sites_web_aliasdomain_delete')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->deleteQuery('../sites/form/web_aliasdomain.tform.php',$primary_id);
+		return $affected_rows;
+	}
+	
+	// ----------------------------------------------------------------------------------------------------------
+	
+	//* Get record details
+	public function sites_web_subdomain_get($session_id, $primary_id)
+    {
+		global $app;
+		
+		if(!$this->checkPerm($session_id, 'sites_web_subdomain_get')) {
+			$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('../sites/form/web_subdomain.tform.php');
+		return $app->remoting_lib->getDataRecord($primary_id);
+	}
+	
+	//* Add a record
+	public function sites_web_subdomain_add($session_id, $client_id, $params)
+    {
+		if(!$this->checkPerm($session_id, 'sites_web_subdomain_add')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		return $this->insertQuery('../sites/form/web_subdomain.tform.php',$client_id,$params);
+	}
+	
+	//* Update a record
+	public function sites_web_subdomain_update($session_id, $client_id, $primary_id, $params)
+    {
+		if(!$this->checkPerm($session_id, 'sites_web_subdomain_update')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->updateQuery('../sites/form/web_subdomain.tform.php',$client_id,$primary_id,$params);
+		return $affected_rows;
+	}
+	
+	//* Delete a record
+	public function sites_web_subdomain_delete($session_id, $primary_id)
+    {
+		if(!$this->checkPerm($session_id, 'sites_web_subdomain_delete')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->deleteQuery('../sites/form/web_subdomain.tform.php',$primary_id);
+		return $affected_rows;
+	}
+	
+	
+	// DNS Function --------------------------------------------------------------------------------------------------
+	
+	//* Get record details
+	public function dns_zone_get($session_id, $primary_id)
+    {
+		global $app;
+		
+		if(!$this->checkPerm($session_id, 'dns_zone_get')) {
+			$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('../dns/form/dns_soa.tform.php');
+		return $app->remoting_lib->getDataRecord($primary_id);
+	}
+	
+	//* Add a record
+	public function dns_zone_add($session_id, $client_id, $params)
+    {
+		if(!$this->checkPerm($session_id, 'dns_zone_add')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		return $this->insertQuery('../dns/form/dns_soa.tform.php',$client_id,$params);
+	}
+	
+	//* Update a record
+	public function dns_zone_update($session_id, $client_id, $primary_id, $params)
+    {
+		if(!$this->checkPerm($session_id, 'dns_zone_update')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->updateQuery('../dns/form/dns_soa.tform.php',$client_id,$primary_id,$params);
+		return $affected_rows;
+	}
+	
+	//* Delete a record
+	public function dns_zone_delete($session_id, $primary_id)
+    {
+		if(!$this->checkPerm($session_id, 'dns_zone_delete')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->deleteQuery('../dns/form/dns_soa.tform.php',$primary_id);
+		return $affected_rows;
+	}
+	
+	// ----------------------------------------------------------------------------------------------------------------
+	
+	//* Get record details
+	public function dns_aaaa_get($session_id, $primary_id)
+    {
+		global $app;
+		
+		if(!$this->checkPerm($session_id, 'dns_aaaa_get')) {
+			$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('../dns/form/dns_aaaa.tform.php');
+		return $app->remoting_lib->getDataRecord($primary_id);
+	}
+	
+	//* Add a record
+	public function dns_aaaa_add($session_id, $client_id, $params)
+    {
+		if(!$this->checkPerm($session_id, 'dns_aaaa_add')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		return $this->insertQuery('../dns/form/dns_aaaa.tform.php',$client_id,$params);
+	}
+	
+	//* Update a record
+	public function dns_aaaa_update($session_id, $client_id, $primary_id, $params)
+    {
+		if(!$this->checkPerm($session_id, 'dns_aaaa_update')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->updateQuery('../dns/form/dns_aaaa.tform.php',$client_id,$primary_id,$params);
+		return $affected_rows;
+	}
+	
+	//* Delete a record
+	public function dns_aaaa_delete($session_id, $primary_id)
+    {
+		if(!$this->checkPerm($session_id, 'dns_aaaa_delete')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->deleteQuery('../dns/form/dns_aaaa.tform.php',$primary_id);
+		return $affected_rows;
+	}
+
+	// ----------------------------------------------------------------------------------------------------------------
+	
+	//* Get record details
+	public function dns_a_get($session_id, $primary_id)
+    {
+		global $app;
+		
+		if(!$this->checkPerm($session_id, 'dns_a_get')) {
+			$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('../dns/form/dns_a.tform.php');
+		return $app->remoting_lib->getDataRecord($primary_id);
+	}
+	
+	//* Add a record
+	public function dns_a_add($session_id, $client_id, $params)
+    {
+		if(!$this->checkPerm($session_id, 'dns_a_add')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		return $this->insertQuery('../dns/form/dns_a.tform.php',$client_id,$params);
+	}
+	
+	//* Update a record
+	public function dns_a_update($session_id, $client_id, $primary_id, $params)
+    {
+		if(!$this->checkPerm($session_id, 'dns_a_update')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->updateQuery('../dns/form/dns_a.tform.php',$client_id,$primary_id,$params);
+		return $affected_rows;
+	}
+	
+	//* Delete a record
+	public function dns_a_delete($session_id, $primary_id)
+    {
+		if(!$this->checkPerm($session_id, 'dns_a_delete')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->deleteQuery('../dns/form/dns_a.tform.php',$primary_id);
+		return $affected_rows;
+	}
+	
+	// ----------------------------------------------------------------------------------------------------------------
+	
+	//* Get record details
+	public function dns_alias_get($session_id, $primary_id)
+    {
+		global $app;
+		
+		if(!$this->checkPerm($session_id, 'dns_alias_get')) {
+			$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('../dns/form/dns_alias.tform.php');
+		return $app->remoting_lib->getDataRecord($primary_id);
+	}
+	
+	//* Add a record
+	public function dns_alias_add($session_id, $client_id, $params)
+    {
+		if(!$this->checkPerm($session_id, 'dns_alias_add')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		return $this->insertQuery('../dns/form/dns_alias.tform.php',$client_id,$params);
+	}
+	
+	//* Update a record
+	public function dns_alias_update($session_id, $client_id, $primary_id, $params)
+    {
+		if(!$this->checkPerm($session_id, 'dns_alias_update')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->updateQuery('../dns/form/dns_alias.tform.php',$client_id,$primary_id,$params);
+		return $affected_rows;
+	}
+	
+	//* Delete a record
+	public function dns_alias_delete($session_id, $primary_id)
+    {
+		if(!$this->checkPerm($session_id, 'dns_alias_delete')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->deleteQuery('../dns/form/dns_alias.tform.php',$primary_id);
+		return $affected_rows;
+	}
+	
+	// ----------------------------------------------------------------------------------------------------------------
+	
+	//* Get record details
+	public function dns_cname_get($session_id, $primary_id)
+    {
+		global $app;
+		
+		if(!$this->checkPerm($session_id, 'dns_cname_get')) {
+			$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('../dns/form/dns_cname.tform.php');
+		return $app->remoting_lib->getDataRecord($primary_id);
+	}
+	
+	//* Add a record
+	public function dns_cname_add($session_id, $client_id, $params)
+    {
+		if(!$this->checkPerm($session_id, 'dns_cname_add')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		return $this->insertQuery('../dns/form/dns_cname.tform.php',$client_id,$params);
+	}
+	
+	//* Update a record
+	public function dns_cname_update($session_id, $client_id, $primary_id, $params)
+    {
+		if(!$this->checkPerm($session_id, 'dns_cname_update')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->updateQuery('../dns/form/dns_cname.tform.php',$client_id,$primary_id,$params);
+		return $affected_rows;
+	}
+	
+	//* Delete a record
+	public function dns_cname_delete($session_id, $primary_id)
+    {
+		if(!$this->checkPerm($session_id, 'dns_cname_delete')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->deleteQuery('../dns/form/dns_cname.tform.php',$primary_id);
+		return $affected_rows;
+	}
+	
+	// ----------------------------------------------------------------------------------------------------------------
+	
+	//* Get record details
+	public function dns_hinfo_get($session_id, $primary_id)
+    {
+		global $app;
+		
+		if(!$this->checkPerm($session_id, 'dns_hinfo_get')) {
+			$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('../dns/form/dns_hinfo.tform.php');
+		return $app->remoting_lib->getDataRecord($primary_id);
+	}
+	
+	//* Add a record
+	public function dns_hinfo_add($session_id, $client_id, $params)
+    {
+		if(!$this->checkPerm($session_id, 'dns_hinfo_add')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		return $this->insertQuery('../dns/form/dns_hinfo.tform.php',$client_id,$params);
+	}
+	
+	//* Update a record
+	public function dns_hinfo_update($session_id, $client_id, $primary_id, $params)
+    {
+		if(!$this->checkPerm($session_id, 'dns_hinfo_update')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->updateQuery('../dns/form/dns_hinfo.tform.php',$client_id,$primary_id,$params);
+		return $affected_rows;
+	}
+	
+	//* Delete a record
+	public function dns_hinfo_delete($session_id, $primary_id)
+    {
+		if(!$this->checkPerm($session_id, 'dns_hinfo_delete')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->deleteQuery('../dns/form/dns_hinfo.tform.php',$primary_id);
+		return $affected_rows;
+	}
+	
+	// ----------------------------------------------------------------------------------------------------------------
+	
+	//* Get record details
+	public function dns_mx_get($session_id, $primary_id)
+    {
+		global $app;
+		
+		if(!$this->checkPerm($session_id, 'dns_mx_get')) {
+			$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('../dns/form/dns_mx.tform.php');
+		return $app->remoting_lib->getDataRecord($primary_id);
+	}
+	
+	//* Add a record
+	public function dns_mx_add($session_id, $client_id, $params)
+    {
+		if(!$this->checkPerm($session_id, 'dns_mx_add')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		return $this->insertQuery('../dns/form/dns_mx.tform.php',$client_id,$params);
+	}
+	
+	//* Update a record
+	public function dns_mx_update($session_id, $client_id, $primary_id, $params)
+    {
+		if(!$this->checkPerm($session_id, 'dns_mx_update')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->updateQuery('../dns/form/dns_mx.tform.php',$client_id,$primary_id,$params);
+		return $affected_rows;
+	}
+	
+	//* Delete a record
+	public function dns_mx_delete($session_id, $primary_id)
+    {
+		if(!$this->checkPerm($session_id, 'dns_mx_delete')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->deleteQuery('../dns/form/dns_mx.tform.php',$primary_id);
+		return $affected_rows;
+	}
+	
+	// ----------------------------------------------------------------------------------------------------------------
+	
+	//* Get record details
+	public function dns_ns_get($session_id, $primary_id)
+    {
+		global $app;
+		
+		if(!$this->checkPerm($session_id, 'dns_ns_get')) {
+			$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('../dns/form/dns_ns.tform.php');
+		return $app->remoting_lib->getDataRecord($primary_id);
+	}
+	
+	//* Add a record
+	public function dns_ns_add($session_id, $client_id, $params)
+    {
+		if(!$this->checkPerm($session_id, 'dns_ns_add')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		return $this->insertQuery('../dns/form/dns_ns.tform.php',$client_id,$params);
+	}
+	
+	//* Update a record
+	public function dns_ns_update($session_id, $client_id, $primary_id, $params)
+    {
+		if(!$this->checkPerm($session_id, 'dns_ns_update')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->updateQuery('../dns/form/dns_ns.tform.php',$client_id,$primary_id,$params);
+		return $affected_rows;
+	}
+	
+	//* Delete a record
+	public function dns_ns_delete($session_id, $primary_id)
+    {
+		if(!$this->checkPerm($session_id, 'dns_ns_delete')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->deleteQuery('../dns/form/dns_ns.tform.php',$primary_id);
+		return $affected_rows;
+	}
+	
+	// ----------------------------------------------------------------------------------------------------------------
+	
+	//* Get record details
+	public function dns_ptr_get($session_id, $primary_id)
+    {
+		global $app;
+		
+		if(!$this->checkPerm($session_id, 'dns_ptr_get')) {
+			$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('../dns/form/dns_ptr.tform.php');
+		return $app->remoting_lib->getDataRecord($primary_id);
+	}
+	
+	//* Add a record
+	public function dns_ptr_add($session_id, $client_id, $params)
+    {
+		if(!$this->checkPerm($session_id, 'dns_ptr_add')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		return $this->insertQuery('../dns/form/dns_ptr.tform.php',$client_id,$params);
+	}
+	
+	//* Update a record
+	public function dns_ptr_update($session_id, $client_id, $primary_id, $params)
+    {
+		if(!$this->checkPerm($session_id, 'dns_ptr_update')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->updateQuery('../dns/form/dns_ptr.tform.php',$client_id,$primary_id,$params);
+		return $affected_rows;
+	}
+	
+	//* Delete a record
+	public function dns_ptr_delete($session_id, $primary_id)
+    {
+		if(!$this->checkPerm($session_id, 'dns_ptr_delete')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->deleteQuery('../dns/form/dns_ptr.tform.php',$primary_id);
+		return $affected_rows;
+	}
+	
+	// ----------------------------------------------------------------------------------------------------------------
+	
+	//* Get record details
+	public function dns_rp_get($session_id, $primary_id)
+    {
+		global $app;
+		
+		if(!$this->checkPerm($session_id, 'dns_rp_get')) {
+			$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('../dns/form/dns_rp.tform.php');
+		return $app->remoting_lib->getDataRecord($primary_id);
+	}
+	
+	//* Add a record
+	public function dns_rp_add($session_id, $client_id, $params)
+    {
+		if(!$this->checkPerm($session_id, 'dns_rp_add')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		return $this->insertQuery('../dns/form/dns_rp.tform.php',$client_id,$params);
+	}
+	
+	//* Update a record
+	public function dns_rp_update($session_id, $client_id, $primary_id, $params)
+    {
+		if(!$this->checkPerm($session_id, 'dns_rp_update')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->updateQuery('../dns/form/dns_rp.tform.php',$client_id,$primary_id,$params);
+		return $affected_rows;
+	}
+	
+	//* Delete a record
+	public function dns_rp_delete($session_id, $primary_id)
+    {
+		if(!$this->checkPerm($session_id, 'dns_rp_delete')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->deleteQuery('../dns/form/dns_rp.tform.php',$primary_id);
+		return $affected_rows;
+	}
+	
+	// ----------------------------------------------------------------------------------------------------------------
+	
+	//* Get record details
+	public function dns_srv_get($session_id, $primary_id)
+    {
+		global $app;
+		
+		if(!$this->checkPerm($session_id, 'dns_srv_get')) {
+			$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('../dns/form/dns_srv.tform.php');
+		return $app->remoting_lib->getDataRecord($primary_id);
+	}
+	
+	//* Add a record
+	public function dns_srv_add($session_id, $client_id, $params)
+    {
+		if(!$this->checkPerm($session_id, 'dns_srv_add')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		return $this->insertQuery('../dns/form/dns_srv.tform.php',$client_id,$params);
+	}
+	
+	//* Update a record
+	public function dns_srv_update($session_id, $client_id, $primary_id, $params)
+    {
+		if(!$this->checkPerm($session_id, 'dns_srv_update')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->updateQuery('../dns/form/dns_srv.tform.php',$client_id,$primary_id,$params);
+		return $affected_rows;
+	}
+	
+	//* Delete a record
+	public function dns_srv_delete($session_id, $primary_id)
+    {
+		if(!$this->checkPerm($session_id, 'dns_srv_delete')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->deleteQuery('../dns/form/dns_srv.tform.php',$primary_id);
+		return $affected_rows;
+	}
+	
+	// ----------------------------------------------------------------------------------------------------------------
+	
+	//* Get record details
+	public function dns_txt_get($session_id, $primary_id)
+    {
+		global $app;
+		
+		if(!$this->checkPerm($session_id, 'dns_txt_get')) {
+			$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('../dns/form/dns_txt.tform.php');
+		return $app->remoting_lib->getDataRecord($primary_id);
+	}
+	
+	//* Add a record
+	public function dns_txt_add($session_id, $client_id, $params)
+    {
+		if(!$this->checkPerm($session_id, 'dns_txt_add')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		return $this->insertQuery('../dns/form/dns_txt.tform.php',$client_id,$params);
+	}
+	
+	//* Update a record
+	public function dns_txt_update($session_id, $client_id, $primary_id, $params)
+    {
+		if(!$this->checkPerm($session_id, 'dns_txt_update')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->updateQuery('../dns/form/dns_txt.tform.php',$client_id,$primary_id,$params);
+		return $affected_rows;
+	}
+	
+	//* Delete a record
+	public function dns_txt_delete($session_id, $primary_id)
+    {
+		if(!$this->checkPerm($session_id, 'dns_txt_delete')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->deleteQuery('../dns/form/dns_txt.tform.php',$primary_id);
+		return $affected_rows;
+	}
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
         
 
 
@@ -892,7 +1912,7 @@
 	
 
 
-	private function klientadd($formdef_file, $client_id, $params)
+	private function klientadd($formdef_file, $reseller_id, $params)
     {
 		global $app, $tform, $remoting_lib;
 		$app->uses('remoting_lib');
@@ -901,7 +1921,7 @@
 		$app->remoting_lib->loadFormDef($formdef_file);
 		
 		//* load the user profile of the client
-		$app->remoting_lib->loadUserProfile($client_id);		
+		$app->remoting_lib->loadUserProfile($reseller_id);		
 		
 		//* Get the SQL query
 		$sql = $app->remoting_lib->getSQL($params,'INSERT',0);
@@ -926,7 +1946,7 @@
 			$new_rec = $app->remoting_lib->getDataRecord($insert_id);
 			$app->remoting_lib->datalogSave('INSERT',$primary_id,array(),$new_rec);
 			
-		$app->remoting_lib->dodaj_usera($params,$insert_id);
+		$app->remoting_lib->ispconfig_sysuser_add($params,$insert_id);
 
 		}
 		
@@ -945,11 +1965,11 @@
 		
 		$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);
+		
+		//* Load the form definition
+		$app->remoting_lib->loadFormDef($formdef_file);
 		
 		//* Get the SQL query
 		$sql = $app->remoting_lib->getSQL($params,'INSERT',0);
@@ -977,7 +1997,9 @@
 			
 		}
 		
-		
+		// set a few values for compatibility with tform actions, mostly used by plugins
+		$this->id = $insert_id;
+		$this->dataRecord = $params;
 		
 		
 		return $insert_id;
@@ -990,11 +2012,11 @@
 		
 		$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);
+		
+		//* Load the form definition
+		$app->remoting_lib->loadFormDef($formdef_file);
 		
 		//* Get the SQL query
 		$sql = $app->remoting_lib->getSQL($params,'UPDATE',$primary_id);
@@ -1004,6 +2026,12 @@
 		}
 		
 		$old_rec = $app->remoting_lib->getDataRecord($primary_id);
+		
+		// set a few values for compatibility with tform actions, mostly used by plugins
+		$this->oldDataRecord = $old_rec;
+		$this->id = $primary_id;
+		$this->dataRecord = $params;
+		
 		
 		$app->db->query($sql);
 		
@@ -1031,8 +2059,18 @@
 		
 		$app->uses('remoting_lib');
 		
+		//* load the user profile of the client
+		$app->remoting_lib->loadUserProfile(0);
+		
 		//* Load the form definition
 		$app->remoting_lib->loadFormDef($formdef_file);
+		
+		$old_rec = $app->remoting_lib->getDataRecord($primary_id);
+		
+		// set a few values for compatibility with tform actions, mostly used by plugins
+		$this->oldDataRecord = $old_rec;
+		$this->id = $primary_id;
+		$this->dataRecord = $params;
 		
 		//* Get the SQL query
 		$sql = $app->remoting_lib->getDeleteSQL($primary_id);
@@ -1048,8 +2086,7 @@
 		
 		//* Save changes to Datalog
 		if($app->remoting_lib->formDef["db_history"] == 'yes') {
-			$rec = $app->remoting_lib->getDataRecord($primary_id);
-			$app->remoting_lib->datalogSave('DELETE',$primary_id,$rec,array());
+			$app->remoting_lib->datalogSave('DELETE',$primary_id,$old_rec,array());
 		}
 		
 		

--
Gitblit v1.9.1