Merge branch 'vmailuid' of /home/git/repositories/renky/ispconfig3

Author: renky

interface/lib/classes/remote.d/mail.inc.php

@@ -214,6 +214,10 @@ public function mail_user_add($session_id, $client_id, $params){
 			return false;
 		}
 
+		//* Set a few params to non empty values that will be overwritten by mail_plugin
+		if (!isset($params['uid'])) $params['uid'] = 999989999;
+		if (!isset($params['gid'])) $params['gid'] = 999989999;
+
 		$affected_rows = $this->insertQuery('../mail/form/mail_user.tform.php', $client_id, $params);
 		return $affected_rows;
 	}

interface/lib/classes/remoting.inc.php

@@ -184,31 +184,6 @@ public function logout($session_id)
 		return $app->db->affectedRows() == 1;
 	}
 
-	//* Add mail domain
-	public function mail_user_add($session_id, $client_id, $params){
-		global $app;
-	
-		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;
-		}
-	
-		//* Check if mail domain exists
-		$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]) {
-			$this->server->fault('mail_domain_does_not_exist','Mail domain - '.$email_parts[1].' - does not exist.');
-			return false;
-		}
-	
-		//* Set a few params to non empty values that will be overwritten by mail_plugin
-		if (!isset($params['uid'])) $params['uid'] = 999989999;
-		if (!isset($params['gid'])) $params['gid'] = 999989999;
-	
-		$affected_rows = $this->insertQuery('../mail/form/mail_user.tform.php', $client_id, $params);
-		return $affected_rows;
-	}
-	
 	//** protected functions -----------------------------------------------------------------------------------