From b1a6a5a3991cec5cd08873b01376e45d0b247f18 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 14 Nov 2013 09:05:33 -0500
Subject: [PATCH] Cleaning up code to match coding guidelines

---
 interface/lib/classes/remote.d/mail.inc.php |  816 +++++++++++++++++++++++++++++-----------------------------
 1 files changed, 409 insertions(+), 407 deletions(-)

diff --git a/interface/lib/classes/remote.d/mail.inc.php b/interface/lib/classes/remote.d/mail.inc.php
index 5370c04..7adaf1f 100644
--- a/interface/lib/classes/remote.d/mail.inc.php
+++ b/interface/lib/classes/remote.d/mail.inc.php
@@ -41,9 +41,9 @@
 class remoting_mail extends remoting {
 	//* Get mail domain details
 	public function mail_domain_get($session_id, $primary_id)
-    {
+	{
 		global $app;
-		
+
 		if(!$this->checkPerm($session_id, 'mail_domain_get')) {
 			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
 			return false;
@@ -52,21 +52,21 @@
 		$app->remoting_lib->loadFormDef('../mail/form/mail_domain.tform.php');
 		return $app->remoting_lib->getDataRecord($primary_id);
 	}
-	
+
 	//* Add a mail domain
 	public function mail_domain_add($session_id, $client_id, $params)
-    {
+	{
 		if(!$this->checkPerm($session_id, 'mail_domain_add')) {
 			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
 			return false;
 		}
-		$primary_id = $this->insertQuery('../mail/form/mail_domain.tform.php',$client_id,$params);
+		$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, $primary_id, $params)
-    {
+	{
 		if(!$this->checkPerm($session_id, 'mail_domain_update')) {
 			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
 			return false;
@@ -74,10 +74,10 @@
 		$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, $primary_id)
-    {
+	{
 		if(!$this->checkPerm($session_id, 'mail_domain_delete')) {
 			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
 			return false;
@@ -85,12 +85,12 @@
 		$affected_rows = $this->deleteQuery('../mail/form/mail_domain.tform.php', $primary_id);
 		return $affected_rows;
 	}
-	
+
 	//* Get alias details
 	public function mail_aliasdomain_get($session_id, $primary_id)
-    {
+	{
 		global $app;
-		
+
 		if(!$this->checkPerm($session_id, 'mail_aliasdomain_get')) {
 			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
 			return false;
@@ -99,13 +99,13 @@
 		$app->remoting_lib->loadFormDef('../mail/form/mail_aliasdomain.tform.php');
 		return $app->remoting_lib->getDataRecord($primary_id);
 	}
-	
+
 	//* aliasy email
 	public function mail_aliasdomain_add($session_id, $client_id, $params)
 	{
 		if (!$this->checkPerm($session_id, 'mail_aliasdomain_add'))
 		{
-			throw new SoapFault('permission_denied','You do not have the permissions to access this function.');
+			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
 			return false;
 		}
 		$affected_rows = $this->insertQuery('../mail/form/mail_aliasdomain.tform.php', $client_id, $params);
@@ -115,31 +115,31 @@
 
 	public function mail_aliasdomain_update($session_id, $client_id, $primary_id, $params)
 	{
-			if (!$this->checkPerm($session_id, 'mail_aliasdomain_update'))
-			{
-					throw new SoapFault('permission_denied','You do not have the permissions to access this function.');
-					return false;
-			}
-			$affected_rows = $this->updateQuery('../mail/form/mail_aliasdomain.tform.php', $client_id, $primary_id, $params);
-			return $affected_rows;
+		if (!$this->checkPerm($session_id, 'mail_aliasdomain_update'))
+		{
+			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->updateQuery('../mail/form/mail_aliasdomain.tform.php', $client_id, $primary_id, $params);
+		return $affected_rows;
 	}
 
 	public function mail_aliasdomain_delete($session_id, $primary_id)
 	{
-			if (!$this->checkPerm($session_id, 'mail_aliasdomain_delete'))
-			{
-					throw new SoapFault('permission_denied','You do not have the permissions to access this function.');
-					return false;
-			}
-			$affected_rows = $this->deleteQuery('../mail/form/mail_aliasdomain.tform.php', $primary_id);
-			return $affected_rows;
+		if (!$this->checkPerm($session_id, 'mail_aliasdomain_delete'))
+		{
+			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->deleteQuery('../mail/form/mail_aliasdomain.tform.php', $primary_id);
+		return $affected_rows;
 	}
-	
+
 	//* Get mail mailinglist details
 	public function mail_mailinglist_get($session_id, $primary_id)
-    {
+	{
 		global $app;
-		
+
 		if(!$this->checkPerm($session_id, 'mail_mailinglist_get')) {
 			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
 			return false;
@@ -148,21 +148,21 @@
 		$app->remoting_lib->loadFormDef('../mail/form/mail_mailinglist.tform.php');
 		return $app->remoting_lib->getDataRecord($primary_id);
 	}
-	
+
 	//* Add a mail mailinglist
 	public function mail_mailinglist_add($session_id, $client_id, $params)
-    {
+	{
 		if(!$this->checkPerm($session_id, 'mail_mailinglist_add')) {
 			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
 			return false;
 		}
-		$primary_id = $this->insertQuery('../mail/form/mail_mailinglist.tform.php',$client_id,$params);
+		$primary_id = $this->insertQuery('../mail/form/mail_mailinglist.tform.php', $client_id, $params);
 		return $primary_id;
 	}
-	
+
 	//* Update a mail mailinglist
 	public function mail_mailinglist_update($session_id, $client_id, $primary_id, $params)
-    {
+	{
 		if(!$this->checkPerm($session_id, 'mail_mailinglist_update')) {
 			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
 			return false;
@@ -170,10 +170,10 @@
 		$affected_rows = $this->updateQuery('../mail/form/mail_mailinglist.tform.php', $client_id, $primary_id, $params);
 		return $affected_rows;
 	}
-	
+
 	//* Delete a mail mailinglist
 	public function mail_mailinglist_delete($session_id, $primary_id)
-    {
+	{
 		if(!$this->checkPerm($session_id, 'mail_mailinglist_delete')) {
 			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
 			return false;
@@ -181,12 +181,12 @@
 		$affected_rows = $this->deleteQuery('../mail/form/mail_mailinglist.tform.php', $primary_id);
 		return $affected_rows;
 	}
-	
+
 	//* Get mail user details
 	public function mail_user_get($session_id, $primary_id)
-    {
+	{
 		global $app;
-		
+
 		if(!$this->checkPerm($session_id, 'mail_user_get')) {
 			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
 			return false;
@@ -195,70 +195,70 @@
 		$app->remoting_lib->loadFormDef('../mail/form/mail_user.tform.php');
 		return $app->remoting_lib->getDataRecord($primary_id);
 	}
-	
-	
+
+
 	//* Add mail domain
 	public function mail_user_add($session_id, $client_id, $params){
 		global $app;
-		
+
 		if (!$this->checkPerm($session_id, 'mail_user_add')){
-			throw new SoapFault('permission_denied','You do not have the permissions to access this function.');
+			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
 			return false;
 		}
-		
+
 		//* Check if mail domain exists
-		$email_parts = explode('@',$params['email']);
+		$email_parts = explode('@', $params['email']);
 		$tmp = $app->db->queryOneRecord("SELECT domain FROM mail_domain WHERE domain = '".$app->db->quote($email_parts[1])."'");
 		if($tmp['domain'] != $email_parts[1]) {
-			throw new SoapFault('mail_domain_does_not_exist','Mail domain - '.$email_parts[1].' - does not exist.');
+			throw new SoapFault('mail_domain_does_not_exist', 'Mail domain - '.$email_parts[1].' - does not exist.');
 			return false;
 		}
-		
+
 		$affected_rows = $this->insertQuery('../mail/form/mail_user.tform.php', $client_id, $params);
 		return $affected_rows;
 	}
 
-	//* Update mail user	
+	//* Update mail user
 	public function mail_user_update($session_id, $client_id, $primary_id, $params)
 	{
 		global $app;
-		
+
 		if (!$this->checkPerm($session_id, 'mail_user_update'))
 		{
-			throw new SoapFault('permission_denied','You do not have the permissions to access this function.');
+			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
 			return false;
 		}
-		
+
 		//* Check if mail domain exists
-		$email_parts = explode('@',$params['email']);
+		$email_parts = explode('@', $params['email']);
 		$tmp = $app->db->queryOneRecord("SELECT domain FROM mail_domain WHERE domain = '".$app->db->quote($email_parts[1])."'");
 		if($tmp['domain'] != $email_parts[1]) {
-			throw new SoapFault('mail_domain_does_not_exist','Mail domain - '.$email_parts[1].' - does not exist.');
+			throw new SoapFault('mail_domain_does_not_exist', 'Mail domain - '.$email_parts[1].' - does not exist.');
 			return false;
 		}
-		
+
 		$affected_rows = $this->updateQuery('../mail/form/mail_user.tform.php', $client_id, $primary_id, $params);
 		return $affected_rows;
 	}
 
-	
+
 	//* Delete mail user
 	public function mail_user_delete($session_id, $primary_id)
 	{
 		if (!$this->checkPerm($session_id, 'mail_user_delete'))
 		{
-			throw new SoapFault('permission_denied','You do not have the permissions to access this function.');
+			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
 			return false;
 		}
 		$affected_rows = $this->deleteQuery('../mail/form/mail_user.tform.php', $primary_id);
 		return $affected_rows;
 	}
-	
+
 	//* Get mail user filter details
 	public function mail_user_filter_get($session_id, $primary_id)
-    {
+	{
 		global $app;
-		
+
 		if(!$this->checkPerm($session_id, 'mail_user_filter_get')) {
 			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
 			return false;
@@ -267,15 +267,15 @@
 		$app->remoting_lib->loadFormDef('../mail/form/mail_user_filter.tform.php');
 		return $app->remoting_lib->getDataRecord($primary_id);
 	}
-	
+
 	public function mail_user_filter_add($session_id, $client_id, $params)
 	{
 		global $app;
 		if (!$this->checkPerm($session_id, 'mail_user_filter_add')){
-			throw new SoapFault('permission_denied','You do not have the permissions to access this function.');
+			throw new SoapFault('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,'mail:mail_user_filter:on_after_insert');
+		$affected_rows = $this->insertQuery('../mail/form/mail_user_filter.tform.php', $client_id, $params, 'mail:mail_user_filter:on_after_insert');
 		// $app->plugin->raiseEvent('mail:mail_user_filter:on_after_insert',$this);
 		return $affected_rows;
 	}
@@ -285,10 +285,10 @@
 		global $app;
 		if (!$this->checkPerm($session_id, 'mail_user_filter_update'))
 		{
-			throw new SoapFault('permission_denied','You do not have the permissions to access this function.');
+			throw new SoapFault('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,'mail:mail_user_filter:on_after_update');
+		$affected_rows = $this->updateQuery('../mail/form/mail_user_filter.tform.php', $client_id, $primary_id, $params, 'mail:mail_user_filter:on_after_update');
 		// $app->plugin->raiseEvent('mail:mail_user_filter:on_after_update',$this);
 		return $affected_rows;
 	}
@@ -298,19 +298,19 @@
 		global $app;
 		if (!$this->checkPerm($session_id, 'mail_user_filter_delete'))
 		{
-			throw new SoapFault('permission_denied','You do not have the permissions to access this function.');
+			throw new SoapFault('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', $primary_id,'mail:mail_user_filter:on_after_delete');
+		$affected_rows = $this->deleteQuery('../mail/form/mail_user_filter.tform.php', $primary_id, 'mail:mail_user_filter:on_after_delete');
 		// $app->plugin->raiseEvent('mail:mail_user_filter:on_after_delete',$this);
 		return $affected_rows;
 	}
 
 	//* Get alias details
 	public function mail_alias_get($session_id, $primary_id)
-    {
+	{
 		global $app;
-		
+
 		if(!$this->checkPerm($session_id, 'mail_alias_get')) {
 			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
 			return false;
@@ -319,25 +319,25 @@
 		$app->remoting_lib->loadFormDef('../mail/form/mail_alias.tform.php');
 		return $app->remoting_lib->getDataRecord($primary_id);
 	}
-	
+
 	//* aliasy email
 	public function mail_alias_add($session_id, $client_id, $params)
 	{
 		global $app;
-		
+
 		if (!$this->checkPerm($session_id, 'mail_alias_add'))
 		{
-			throw new SoapFault('permission_denied','You do not have the permissions to access this function.');
+			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
 			return false;
 		}
-		
+
 		//* Check if there is no active mailbox with this address
 		$tmp = $app->db->queryOneRecord("SELECT count(mailuser_id) as number FROM mail_user WHERE postfix = 'y' AND email = '".$app->db->quote($params["source"])."'");
 		if($tmp['number'] > 0) {
-			throw new SoapFault('duplicate','There is already a mailbox with this email address.');
+			throw new SoapFault('duplicate', 'There is already a mailbox with this email address.');
 		}
 		unset($tmp);
-		
+
 		$affected_rows = $this->insertQuery('../mail/form/mail_alias.tform.php', $client_id, $params);
 		return $affected_rows;
 	}
@@ -346,40 +346,40 @@
 	public function mail_alias_update($session_id, $client_id, $primary_id, $params)
 	{
 		global $app;
-		
+
 		if (!$this->checkPerm($session_id, 'mail_alias_update'))
 		{
-			throw new SoapFault('permission_denied','You do not have the permissions to access this function.');
+			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
 			return false;
 		}
-			
-			//* Check if there is no active mailbox with this address
+
+		//* Check if there is no active mailbox with this address
 		$tmp = $app->db->queryOneRecord("SELECT count(mailuser_id) as number FROM mail_user WHERE postfix = 'y' AND email = '".$app->db->quote($params["source"])."'");
 		if($tmp['number'] > 0) {
-			throw new SoapFault('duplicate','There is already a mailbox with this email address.');
+			throw new SoapFault('duplicate', 'There is already a mailbox with this email address.');
 		}
 		unset($tmp);
-			
+
 		$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, $primary_id)
 	{
-			if (!$this->checkPerm($session_id, 'mail_alias_delete'))
-			{
-					throw new SoapFault('permission_denied','You do not have the permissions to access this function.');
-					return false;
-			}
-			$affected_rows = $this->deleteQuery('../mail/form/mail_alias.tform.php', $primary_id);
-			return $affected_rows;
+		if (!$this->checkPerm($session_id, 'mail_alias_delete'))
+		{
+			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->deleteQuery('../mail/form/mail_alias.tform.php', $primary_id);
+		return $affected_rows;
 	}
-	
+
 	//* Get mail forwarding details
 	public function mail_forward_get($session_id, $primary_id)
-    {
+	{
 		global $app;
-		
+
 		if(!$this->checkPerm($session_id, 'mail_forward_get')) {
 			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
 			return false;
@@ -388,48 +388,48 @@
 		$app->remoting_lib->loadFormDef('../mail/form/mail_forward.tform.php');
 		return $app->remoting_lib->getDataRecord($primary_id);
 	}
-	
- 	//* przekierowania email
+
+	//* przekierowania email
 	public function mail_forward_add($session_id, $client_id, $params)
 	{
-			if (!$this->checkPerm($session_id, 'mail_forward_add'))
-			{
-					throw new SoapFault('permission_denied','You do not have the permissions to access this function.');
-					return false;
-			}
-			$affected_rows = $this->insertQuery('../mail/form/mail_forward.tform.php', $client_id, $params);
-			return $affected_rows;
+		if (!$this->checkPerm($session_id, 'mail_forward_add'))
+		{
+			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->insertQuery('../mail/form/mail_forward.tform.php', $client_id, $params);
+		return $affected_rows;
 	}
 
 
 	public function mail_forward_update($session_id, $client_id, $primary_id, $params)
 	{
-			if (!$this->checkPerm($session_id, 'mail_forward_update'))
-			{
-					throw new SoapFault('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, $primary_id, $params);
-			return $affected_rows;
+		if (!$this->checkPerm($session_id, 'mail_forward_update'))
+		{
+			throw new SoapFault('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, $primary_id, $params);
+		return $affected_rows;
 	}
 
 
 	public function mail_forward_delete($session_id, $primary_id)
 	{
-			if (!$this->checkPerm($session_id, 'mail_forward_delete'))
-			{
-					throw new SoapFault('permission_denied','You do not have the permissions to access this function.');
-					return false;
-			}
-			$affected_rows = $this->deleteQuery('../mail/form/mail_forward.tform.php', $primary_id);
-			return $affected_rows;
+		if (!$this->checkPerm($session_id, 'mail_forward_delete'))
+		{
+			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->deleteQuery('../mail/form/mail_forward.tform.php', $primary_id);
+		return $affected_rows;
 	}
-	
+
 	//* Get catchall details
 	public function mail_catchall_get($session_id, $primary_id)
-    {
+	{
 		global $app;
-		
+
 		if(!$this->checkPerm($session_id, 'mail_catchall_get')) {
 			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
 			return false;
@@ -440,44 +440,44 @@
 	}
 
 	//* catchall e-mail
- 	public function mail_catchall_add($session_id, $client_id, $params)
+	public function mail_catchall_add($session_id, $client_id, $params)
 	{
-			if (!$this->checkPerm($session_id, 'mail_catchall_add'))
-			{
-					throw new SoapFault('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', $client_id, $params);
-			return $affected_rows;
+		if (!$this->checkPerm($session_id, 'mail_catchall_add'))
+		{
+			throw new SoapFault('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', $client_id, $params);
+		return $affected_rows;
 	}
 
 	public function mail_catchall_update($session_id, $client_id, $primary_id, $params)
 	{
-			if (!$this->checkPerm($session_id, 'mail_catchall_update'))
-			{
-					throw new SoapFault('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, $primary_id, $params);
-			return $affected_rows;
+		if (!$this->checkPerm($session_id, 'mail_catchall_update'))
+		{
+			throw new SoapFault('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, $primary_id, $params);
+		return $affected_rows;
 	}
 
 	public function mail_catchall_delete($session_id, $primary_id)
 	{
-			if (!$this->checkPerm($session_id, 'mail_catchall_delete'))
-			{
-					throw new SoapFault('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', $primary_id);
-			return $affected_rows;
+		if (!$this->checkPerm($session_id, 'mail_catchall_delete'))
+		{
+			throw new SoapFault('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', $primary_id);
+		return $affected_rows;
 	}
-	
+
 	//* Get transport details
 	public function mail_transport_get($session_id, $primary_id)
-    {
+	{
 		global $app;
-		
+
 		if(!$this->checkPerm($session_id, 'mail_transport_get')) {
 			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
 			return false;
@@ -486,48 +486,48 @@
 		$app->remoting_lib->loadFormDef('../mail/form/mail_transport.tform.php');
 		return $app->remoting_lib->getDataRecord($primary_id);
 	}
-	
+
 	//* przeniesienia e-mail
 	public function mail_transport_add($session_id, $client_id, $params)
 	{
-			if (!$this->checkPerm($session_id, 'mail_transport_add'))
-			{
-					throw new SoapFault('permission_denied','You do not have the permissions to access this function.');
-					return false;
-			}
-			$affected_rows = $this->insertQuery('../mail/form/mail_transport.tform.php', $client_id, $params);
-			return $affected_rows;
+		if (!$this->checkPerm($session_id, 'mail_transport_add'))
+		{
+			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->insertQuery('../mail/form/mail_transport.tform.php', $client_id, $params);
+		return $affected_rows;
 	}
 
 
 	public function mail_transport_update($session_id, $client_id, $primary_id, $params)
 	{
-			if (!$this->checkPerm($session_id, 'mail_transport_update'))
-			{
-					throw new SoapFault('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, $primary_id, $params);
-			return $affected_rows;
+		if (!$this->checkPerm($session_id, 'mail_transport_update'))
+		{
+			throw new SoapFault('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, $primary_id, $params);
+		return $affected_rows;
 	}
 
 
 	public function mail_transport_delete($session_id, $primary_id)
 	{
-			if (!$this->checkPerm($session_id, 'mail_transport_delete'))
-			{
-					throw new SoapFault('permission_denied','You do not have the permissions to access this function.');
-					return false;
-			}
-			$affected_rows = $this->deleteQuery('../mail/form/mail_transport.tform.php', $primary_id);
-			return $affected_rows;
+		if (!$this->checkPerm($session_id, 'mail_transport_delete'))
+		{
+			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->deleteQuery('../mail/form/mail_transport.tform.php', $primary_id);
+		return $affected_rows;
 	}
-	
+
 	//* Get spamfilter whitelist details
 	public function mail_spamfilter_whitelist_get($session_id, $primary_id)
-    {
+	{
 		global $app;
-		
+
 		if(!$this->checkPerm($session_id, 'mail_spamfilter_whitelist_get')) {
 			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
 			return false;
@@ -537,47 +537,47 @@
 		return $app->remoting_lib->getDataRecord($primary_id);
 	}
 
- 	//* biała lista e-mail
+	//* biała lista e-mail
 	public function mail_spamfilter_whitelist_add($session_id, $client_id, $params)
 	{
-			if (!$this->checkPerm($session_id, 'mail_spamfilter_whitelist_add'))
-			{
-					throw new SoapFault('permission_denied','You do not have the permissions to access this function.');
-					return false;
-			}
-			$affected_rows = $this->insertQuery('../mail/form/spamfilter_whitelist.tform.php', $client_id, $params);
-			return $affected_rows;
+		if (!$this->checkPerm($session_id, 'mail_spamfilter_whitelist_add'))
+		{
+			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->insertQuery('../mail/form/spamfilter_whitelist.tform.php', $client_id, $params);
+		return $affected_rows;
 	}
 
 
 	public function mail_spamfilter_whitelist_update($session_id, $client_id, $primary_id, $params)
 	{
-			if (!$this->checkPerm($session_id, 'mail_spamfilter_whitelist_update'))
-			{
-					throw new SoapFault('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, $primary_id, $params);
-			return $affected_rows;
+		if (!$this->checkPerm($session_id, 'mail_spamfilter_whitelist_update'))
+		{
+			throw new SoapFault('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, $primary_id, $params);
+		return $affected_rows;
 	}
 
 
 	public function mail_spamfilter_whitelist_delete($session_id, $primary_id)
 	{
-			if (!$this->checkPerm($session_id, 'mail_spamfilter_whitelist_delete'))
-			{
-					throw new SoapFault('permission_denied','You do not have the permissions to access this function.');
-					return false;
-			}
-			$affected_rows = $this->deleteQuery('../mail/form/spamfilter_whitelist.tform.php', $primary_id);
-			return $affected_rows;
+		if (!$this->checkPerm($session_id, 'mail_spamfilter_whitelist_delete'))
+		{
+			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->deleteQuery('../mail/form/spamfilter_whitelist.tform.php', $primary_id);
+		return $affected_rows;
 	}
-	
+
 	//* Get spamfilter blacklist details
 	public function mail_spamfilter_blacklist_get($session_id, $primary_id)
-    {
+	{
 		global $app;
-		
+
 		if(!$this->checkPerm($session_id, 'mail_spamfilter_blacklist_get')) {
 			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
 			return false;
@@ -586,48 +586,48 @@
 		$app->remoting_lib->loadFormDef('../mail/form/spamfilter_blacklist.tform.php');
 		return $app->remoting_lib->getDataRecord($primary_id);
 	}
-	
- 	//* czarna lista e-mail
+
+	//* czarna lista e-mail
 	public function mail_spamfilter_blacklist_add($session_id, $client_id, $params)
 	{
-			if (!$this->checkPerm($session_id, 'mail_spamfilter_blacklist_add'))
-			{
-					throw new SoapFault('permission_denied','You do not have the permissions to access this function.');
-					return false;
-			}
-			$affected_rows = $this->insertQuery('../mail/form/spamfilter_blacklist.tform.php', $client_id, $params);
-			return $affected_rows;
+		if (!$this->checkPerm($session_id, 'mail_spamfilter_blacklist_add'))
+		{
+			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->insertQuery('../mail/form/spamfilter_blacklist.tform.php', $client_id, $params);
+		return $affected_rows;
 	}
 
 
 	public function mail_spamfilter_blacklist_update($session_id, $client_id, $primary_id, $params)
 	{
-			if (!$this->checkPerm($session_id, 'mail_spamfilter_blacklist_update'))
-			{
-					throw new SoapFault('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, $primary_id, $params);
-			return $affected_rows;
+		if (!$this->checkPerm($session_id, 'mail_spamfilter_blacklist_update'))
+		{
+			throw new SoapFault('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, $primary_id, $params);
+		return $affected_rows;
 	}
 
 
 	public function mail_spamfilter_blacklist_delete($session_id, $primary_id)
 	{
-			if (!$this->checkPerm($session_id, 'mail_spamfilter_blacklist_delete'))
-			{
-					throw new SoapFault('permission_denied','You do not have the permissions to access this function.');
-					return false;
-			}
-			$affected_rows = $this->deleteQuery('../mail/form/spamfilter_blacklist.tform.php', $primary_id);
-			return $affected_rows;
+		if (!$this->checkPerm($session_id, 'mail_spamfilter_blacklist_delete'))
+		{
+			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->deleteQuery('../mail/form/spamfilter_blacklist.tform.php', $primary_id);
+		return $affected_rows;
 	}
-	
+
 	//* Get spamfilter user details
 	public function mail_spamfilter_user_get($session_id, $primary_id)
-    {
+	{
 		global $app;
-		
+
 		if(!$this->checkPerm($session_id, 'mail_spamfilter_user_get')) {
 			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
 			return false;
@@ -640,44 +640,44 @@
 	//* filtr spamu użytkowników e-mail
 	public function mail_spamfilter_user_add($session_id, $client_id, $params)
 	{
-			if (!$this->checkPerm($session_id, 'mail_spamfilter_user_add'))
-			{
-					throw new SoapFault('permission_denied','You do not have the permissions to access this function.');
-					return false;
-			}
-			$affected_rows = $this->insertQuery('../mail/form/spamfilter_users.tform.php', $client_id, $params);
-			return $affected_rows;
+		if (!$this->checkPerm($session_id, 'mail_spamfilter_user_add'))
+		{
+			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->insertQuery('../mail/form/spamfilter_users.tform.php', $client_id, $params);
+		return $affected_rows;
 	}
 
 
 	public function mail_spamfilter_user_update($session_id, $client_id, $primary_id, $params)
 	{
-			if (!$this->checkPerm($session_id, 'mail_spamfilter_user_update'))
-			{
-					throw new SoapFault('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, $primary_id, $params);
-			return $affected_rows;
+		if (!$this->checkPerm($session_id, 'mail_spamfilter_user_update'))
+		{
+			throw new SoapFault('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, $primary_id, $params);
+		return $affected_rows;
 	}
 
 
 	public function mail_spamfilter_user_delete($session_id, $primary_id)
 	{
-			if (!$this->checkPerm($session_id, 'mail_spamfilter_user_delete'))
-			{
-					throw new SoapFault('permission_denied','You do not have the permissions to access this function.');
-					return false;
-			}
-			$affected_rows = $this->deleteQuery('../mail/form/spamfilter_users.tform.php', $primary_id);
-			return $affected_rows;
+		if (!$this->checkPerm($session_id, 'mail_spamfilter_user_delete'))
+		{
+			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->deleteQuery('../mail/form/spamfilter_users.tform.php', $primary_id);
+		return $affected_rows;
 	}
-	
+
 	//* Get policy details
 	public function mail_policy_get($session_id, $primary_id)
-    {
+	{
 		global $app;
-		
+
 		if(!$this->checkPerm($session_id, 'mail_policy_get')) {
 			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
 			return false;
@@ -686,48 +686,48 @@
 		$app->remoting_lib->loadFormDef('../mail/form/spamfilter_policy.tform.php');
 		return $app->remoting_lib->getDataRecord($primary_id);
 	}
-	
- 	//* polityki filtrów spamu e-mail
+
+	//* polityki filtrów spamu e-mail
 	public function mail_policy_add($session_id, $client_id, $params)
 	{
-			if (!$this->checkPerm($session_id, 'mail_policy_add'))
-			{
-					throw new SoapFault('permission_denied','You do not have the permissions to access this function.');
-					return false;
-			}
-			$affected_rows = $this->insertQuery('../mail/form/spamfilter_policy.tform.php', $client_id, $params);
-			return $affected_rows;
+		if (!$this->checkPerm($session_id, 'mail_policy_add'))
+		{
+			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->insertQuery('../mail/form/spamfilter_policy.tform.php', $client_id, $params);
+		return $affected_rows;
 	}
 
 
 	public function mail_policy_update($session_id, $client_id, $primary_id, $params)
 	{
-			if (!$this->checkPerm($session_id, 'mail_policy_update'))
-			{
-					throw new SoapFault('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, $primary_id, $params);
-			return $affected_rows;
+		if (!$this->checkPerm($session_id, 'mail_policy_update'))
+		{
+			throw new SoapFault('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, $primary_id, $params);
+		return $affected_rows;
 	}
 
 
 	public function mail_policy_delete($session_id, $primary_id)
 	{
-			if (!$this->checkPerm($session_id, 'mail_policy_delete'))
-			{
-					throw new SoapFault('permission_denied','You do not have the permissions to access this function.');
-					return false;
-			}
-			$affected_rows = $this->deleteQuery('../mail/form/spamfilter_policy.tform.php', $primary_id);
-			return $affected_rows;
+		if (!$this->checkPerm($session_id, 'mail_policy_delete'))
+		{
+			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->deleteQuery('../mail/form/spamfilter_policy.tform.php', $primary_id);
+		return $affected_rows;
 	}
-	
+
 	//* Get fetchmail details
 	public function mail_fetchmail_get($session_id, $primary_id)
-    {
+	{
 		global $app;
-		
+
 		if(!$this->checkPerm($session_id, 'mail_fetchmail_get')) {
 			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
 			return false;
@@ -737,47 +737,47 @@
 		return $app->remoting_lib->getDataRecord($primary_id);
 	}
 
-	 //* fetchmail
+	//* fetchmail
 	public function mail_fetchmail_add($session_id, $client_id, $params)
 	{
-			if (!$this->checkPerm($session_id, 'mail_fetchmail_add'))
-			{
-					throw new SoapFault('permission_denied','You do not have the permissions to access this function.');
-					return false;
-			}
-			$affected_rows = $this->insertQuery('../mail/form/mail_get.tform.php', $client_id, $params);
-			return $affected_rows;
+		if (!$this->checkPerm($session_id, 'mail_fetchmail_add'))
+		{
+			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->insertQuery('../mail/form/mail_get.tform.php', $client_id, $params);
+		return $affected_rows;
 	}
 
 
 	public function mail_fetchmail_update($session_id, $client_id, $primary_id, $params)
 	{
-			if (!$this->checkPerm($session_id, 'mail_fetchmail_update'))
-			{
-					throw new SoapFault('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, $primary_id, $params);
-			return $affected_rows;
+		if (!$this->checkPerm($session_id, 'mail_fetchmail_update'))
+		{
+			throw new SoapFault('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, $primary_id, $params);
+		return $affected_rows;
 	}
 
 
 	public function mail_fetchmail_delete($session_id, $primary_id)
 	{
-			if (!$this->checkPerm($session_id, 'mail_fetchmail_delete'))
-			{
-					throw new SoapFault('permission_denied','You do not have the permissions to access this function.');
-					return false;
-			}
-			$affected_rows = $this->deleteQuery('../mail/form/mail_get.tform.php', $primary_id);
-			return $affected_rows;
+		if (!$this->checkPerm($session_id, 'mail_fetchmail_delete'))
+		{
+			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->deleteQuery('../mail/form/mail_get.tform.php', $primary_id);
+		return $affected_rows;
 	}
-	
+
 	//* Get whitelist details
 	public function mail_whitelist_get($session_id, $primary_id)
-    {
+	{
 		global $app;
-		
+
 		if(!$this->checkPerm($session_id, 'mail_whitelist_get')) {
 			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
 			return false;
@@ -786,48 +786,48 @@
 		$app->remoting_lib->loadFormDef('../mail/form/mail_whitelist.tform.php');
 		return $app->remoting_lib->getDataRecord($primary_id);
 	}
-	
+
 	//* wpisy białej listy
 	public function mail_whitelist_add($session_id, $client_id, $params)
 	{
-			if (!$this->checkPerm($session_id, 'mail_whitelist_add'))
-			{
-					throw new SoapFault('permission_denied','You do not have the permissions to access this function.');
-					return false;
-			}
-			$affected_rows = $this->insertQuery('../mail/form/mail_whitelist.tform.php', $client_id, $params);
-			return $affected_rows;
+		if (!$this->checkPerm($session_id, 'mail_whitelist_add'))
+		{
+			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->insertQuery('../mail/form/mail_whitelist.tform.php', $client_id, $params);
+		return $affected_rows;
 	}
 
 
 	public function mail_whitelist_update($session_id, $client_id, $primary_id, $params)
 	{
-			if (!$this->checkPerm($session_id, 'mail_whitelist_update'))
-			{
-					throw new SoapFault('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, $primary_id, $params);
-			return $affected_rows;
+		if (!$this->checkPerm($session_id, 'mail_whitelist_update'))
+		{
+			throw new SoapFault('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, $primary_id, $params);
+		return $affected_rows;
 	}
 
 
 	public function mail_whitelist_delete($session_id, $primary_id)
 	{
-			if (!$this->checkPerm($session_id, 'mail_whitelist_delete'))
-			{
-					throw new SoapFault('permission_denied','You do not have the permissions to access this function.');
-					return false;
-			}
-			$affected_rows = $this->deleteQuery('../mail/form/mail_whitelist.tform.php', $primary_id);
-			return $affected_rows;
+		if (!$this->checkPerm($session_id, 'mail_whitelist_delete'))
+		{
+			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->deleteQuery('../mail/form/mail_whitelist.tform.php', $primary_id);
+		return $affected_rows;
 	}
-	
+
 	//* Get Blacklist details
 	public function mail_blacklist_get($session_id, $primary_id)
-    {
+	{
 		global $app;
-		
+
 		if(!$this->checkPerm($session_id, 'mail_blacklist_get')) {
 			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
 			return false;
@@ -836,48 +836,48 @@
 		$app->remoting_lib->loadFormDef('../mail/form/mail_blacklist.tform.php');
 		return $app->remoting_lib->getDataRecord($primary_id);
 	}
-	
+
 	//* wpisy białej listy
 	public function mail_blacklist_add($session_id, $client_id, $params)
 	{
-			if (!$this->checkPerm($session_id, 'mail_blacklist_add'))
-			{
-					throw new SoapFault('permission_denied','You do not have the permissions to access this function.');
-					return false;
-			}
-			$affected_rows = $this->insertQuery('../mail/form/mail_blacklist.tform.php', $client_id, $params);
-			return $affected_rows;
+		if (!$this->checkPerm($session_id, 'mail_blacklist_add'))
+		{
+			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->insertQuery('../mail/form/mail_blacklist.tform.php', $client_id, $params);
+		return $affected_rows;
 	}
 
 
 	public function mail_blacklist_update($session_id, $client_id, $primary_id, $params)
 	{
-			if (!$this->checkPerm($session_id, 'mail_blacklist_update'))
-			{
-					throw new SoapFault('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, $primary_id, $params);
-			return $affected_rows;
+		if (!$this->checkPerm($session_id, 'mail_blacklist_update'))
+		{
+			throw new SoapFault('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, $primary_id, $params);
+		return $affected_rows;
 	}
 
 
 	public function mail_blacklist_delete($session_id, $primary_id)
 	{
-			if (!$this->checkPerm($session_id, 'mail_blacklist_delete'))
-			{
-					throw new SoapFault('permission_denied','You do not have the permissions to access this function.');
-					return false;
-			}
-			$affected_rows = $this->deleteQuery('../mail/form/mail_blacklist.tform.php', $primary_id);
-			return $affected_rows;
+		if (!$this->checkPerm($session_id, 'mail_blacklist_delete'))
+		{
+			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$affected_rows = $this->deleteQuery('../mail/form/mail_blacklist.tform.php', $primary_id);
+		return $affected_rows;
 	}
-	
+
 	//* Get filter details
 	public function mail_filter_get($session_id, $primary_id)
-    {
+	{
 		global $app;
-		
+
 		if(!$this->checkPerm($session_id, 'mail_filter_get')) {
 			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
 			return false;
@@ -890,84 +890,86 @@
 	//* wpisy filtrow e-mail
 	public function mail_filter_add($session_id, $client_id, $params)
 	{
-			if (!$this->checkPerm($session_id, 'mail_filter_add'))
-			{
-					throw new SoapFault('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', $client_id, $params);
-			return $affected_rows;
+		if (!$this->checkPerm($session_id, 'mail_filter_add'))
+		{
+			throw new SoapFault('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', $client_id, $params);
+		return $affected_rows;
 	}
 
 
 	public function mail_filter_update($session_id, $client_id, $primary_id, $params)
 	{
-			if (!$this->checkPerm($session_id, 'mail_filter_update'))
-			{
-					throw new SoapFault('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, $primary_id, $params);
-			return $affected_rows;
+		if (!$this->checkPerm($session_id, 'mail_filter_update'))
+		{
+			throw new SoapFault('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, $primary_id, $params);
+		return $affected_rows;
 	}
 
 
 	public function mail_filter_delete($session_id, $primary_id)
 	{
-			if (!$this->checkPerm($session_id, 'mail_filter_delete'))
-			{
-					throw new SoapFault('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', $primary_id);
-			return $affected_rows;
+		if (!$this->checkPerm($session_id, 'mail_filter_delete'))
+		{
+			throw new SoapFault('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', $primary_id);
+		return $affected_rows;
 	}
 
-    /**
-    * Fetch the mail_domain record for the provided domain.
-    * @param int session_id
-    * @param string the fully qualified domain (or subdomain)
-    * @return array array of arrays corresponding to the mail_domain table's records
-    * @author till, benlake
-    */
-	public function mail_domain_get_by_domain($session_id, $domain) {
-        global $app;
-        if(!$this->checkPerm($session_id, 'mail_domain_get_by_domain')) {
-			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
-            return false;
-        }        
-        if (!empty($domain)) {
-        	$domain      	= $app->db->quote($domain);        	
-    	    $sql            = "SELECT * FROM mail_domain WHERE domain = '$domain'";
-        	$result         = $app->db->queryAllRecords($sql);
-        	return          $result;
-        }
-        return false;
-    }
+	/**
+	 * Fetch the mail_domain record for the provided domain.
+	 * @param int session_id
+	 * @param string the fully qualified domain (or subdomain)
+	 * @return array array of arrays corresponding to the mail_domain table's records
+	 * @author till, benlake
+	 */
 
-    public function mail_domain_set_status($session_id, $primary_id, $status) {
-        global $app;
-        if(!$this->checkPerm($session_id, 'mail_domain_set_status')) {
-              throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
-               return false;
-        }        
-        if(in_array($status, array('active', 'inactive'))) {	    	        	
-	    	if ($status == 'active') {
-	    		$status = 'y';
-	    	} else {
-	    		$status = 'n';
-	    	}
-	        $sql = "UPDATE mail_domain SET active = '$status' WHERE domain_id = ".$app->functions->intval($primary_id);
-	        $app->db->query($sql);
-	        $result = $app->db->affectedRows();
-	        return $result;
-        } else {
+
+	public function mail_domain_get_by_domain($session_id, $domain) {
+		global $app;
+		if(!$this->checkPerm($session_id, 'mail_domain_get_by_domain')) {
+			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		if (!empty($domain)) {
+			$domain       = $app->db->quote($domain);
+			$sql            = "SELECT * FROM mail_domain WHERE domain = '$domain'";
+			$result         = $app->db->queryAllRecords($sql);
+			return          $result;
+		}
+		return false;
+	}
+
+	public function mail_domain_set_status($session_id, $primary_id, $status) {
+		global $app;
+		if(!$this->checkPerm($session_id, 'mail_domain_set_status')) {
+			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		if(in_array($status, array('active', 'inactive'))) {
+			if ($status == 'active') {
+				$status = 'y';
+			} else {
+				$status = 'n';
+			}
+			$sql = "UPDATE mail_domain SET active = '$status' WHERE domain_id = ".$app->functions->intval($primary_id);
+			$app->db->query($sql);
+			$result = $app->db->affectedRows();
+			return $result;
+		} else {
 			throw new SoapFault('status_undefined', 'The status is not available');
 			return false;
-        }  
-    }
-	
+		}
+	}
+
 
 }
 
-?>
\ No newline at end of file
+?>

--
Gitblit v1.9.1