diff --git a/admin_ipsandports.php b/admin_ipsandports.php
index eddcf429..c9165618 100644
--- a/admin_ipsandports.php
+++ b/admin_ipsandports.php
@@ -16,27 +16,24 @@
  * @package    Panel
  *
  */
-
 define('AREA', 'admin');
 require './lib/init.php';
 
 if (isset($_POST['id'])) {
 	$id = intval($_POST['id']);
-} elseif(isset($_GET['id'])) {
+} elseif (isset($_GET['id'])) {
 	$id = intval($_GET['id']);
 }
 
-if ($page == 'ipsandports'
-	|| $page == 'overview'
-) {
+if ($page == 'ipsandports' || $page == 'overview') {
 	// Do not display attributes that are not used by the current webserver
 	$websrv = Settings::Get('system.webserver');
 	$is_nginx = ($websrv == 'nginx');
 	$is_apache = ($websrv == 'apache2');
 	$is_apache24 = $is_apache && (Settings::Get('system.apache24') === '1');
-
+	
 	if ($action == '') {
-
+		
 		$log->logAction(ADM_ACTION, LOG_NOTICE, "viewed admin_ipsandports");
 		$fields = array(
 			'ip' => $lng['admin']['ipsandports']['ip'],
@@ -53,384 +50,106 @@ if ($page == 'ipsandports'
 		$pagingcode = $paging->getHtmlPagingCode($filename . '?page=' . $page . '&s=' . $s);
 		$i = 0;
 		$count = 0;
-
+		
 		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
-
+			
 			if ($paging->checkDisplay($i)) {
 				$row = htmlentities_array($row);
 				if (filter_var($row['ip'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
 					$row['ip'] = '[' . $row['ip'] . ']';
 				}
 				eval("\$ipsandports.=\"" . getTemplate("ipsandports/ipsandports_ipandport") . "\";");
-				$count++;
+				$count ++;
 			}
-			$i++;
+			$i ++;
 		}
-
 		eval("echo \"" . getTemplate("ipsandports/ipsandports") . "\";");
-
-	} elseif($action == 'delete'
-		&& $id != 0
-	) {
-		$result_stmt = Database::prepare("SELECT `id`, `ip`, `port` FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `id` = :id");
-		$result = Database::pexecute_first($result_stmt, array('id' => $id));
-
-		if (isset($result['id'])
-			&& $result['id'] == $id
-		) {
-			$result_checkdomain_stmt = Database::prepare("
-				SELECT `id_domain` as `id` FROM `" . TABLE_DOMAINTOIP . "` WHERE `id_ipandports` = :id"
-			);
-			$result_checkdomain = Database::pexecute_first($result_checkdomain_stmt, array('id' => $id));
-
-			if ($result_checkdomain['id'] == '') {
-				if (!in_array($result['id'], explode(',', Settings::Get('system.defaultip')))) {
-
-					$result_sameipotherport_stmt = Database::prepare("
-						SELECT `id` FROM `" . TABLE_PANEL_IPSANDPORTS . "`
-						WHERE `ip` = :ip AND `id` <> :id"
-					);
-					$result_sameipotherport = Database::pexecute_first($result_sameipotherport_stmt, array('id' => $id, 'ip' => $result['ip']));
-
-					if (($result['ip'] != Settings::Get('system.ipaddress'))
-						|| ($result['ip'] == Settings::Get('system.ipaddress')
-						&& $result_sameipotherport['id'] != '')
-					) {
-						$result_stmt = Database::prepare("
-							SELECT `ip`, `port` FROM `" . TABLE_PANEL_IPSANDPORTS . "`
-							WHERE `id` = :id"
-						);
-						$result = Database::pexecute_first($result_stmt, array('id' => $id));
-
-						if ($result['ip'] != '') {
-
-							if (isset($_POST['send'])
-								&& $_POST['send'] == 'send'
-							) {
-								$del_stmt = Database::prepare("
-									DELETE FROM `" . TABLE_PANEL_IPSANDPORTS . "`
-									WHERE `id` = :id"
-								);
-								Database::pexecute($del_stmt, array('id' => $id));
-
-								// also, remove connections to domains (multi-stack)
-								$del_stmt = Database::prepare("
-									DELETE FROM `".TABLE_DOMAINTOIP."` WHERE `id_ipandports` = :id"
-								);
-								Database::pexecute($del_stmt, array('id' => $id));
-
-								$log->logAction(ADM_ACTION, LOG_WARNING, "deleted IP/port '" . $result['ip'] . ":" . $result['port'] . "'");
-								inserttask('1');
-								// Using nameserver, insert a task which rebuilds the server config
-								inserttask('4');
-
-								redirectTo($filename, array('page' => $page, 's' => $s));
-
-							} else {
-								ask_yesno('admin_ip_reallydelete', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $result['ip'] . ':' . $result['port']);
-							}
-						}
-					} else {
-						standard_error('cantdeletesystemip');
-					}
-				} else {
-					standard_error('cantdeletedefaultip');
+	} elseif ($action == 'delete' && $id != 0) {
+		try {
+			$json_result = IpsAndPorts::getLocal($userinfo, array(
+				'id' => $id
+			))->get();
+		} catch (Exception $e) {
+			dynamic_error($e->getMessage());
+		}
+		$result = json_decode($json_result, true)['data'];
+		
+		if (isset($result['id']) && $result['id'] == $id) {
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
+				
+				try {
+					IpsAndPorts::getLocal($userinfo, array(
+						'id' => $id
+					))->delete();
+				} catch (Exception $e) {
+					dynamic_error($e->getMessage());
 				}
+				
+				redirectTo($filename, array(
+					'page' => $page,
+					's' => $s
+				));
 			} else {
-				standard_error('ipstillhasdomains');
+				ask_yesno('admin_ip_reallydelete', $filename, array(
+					'id' => $id,
+					'page' => $page,
+					'action' => $action
+				), $result['ip'] . ':' . $result['port']);
 			}
 		}
-
-	} elseif($action == 'add') {
-
-		if (isset($_POST['send'])
-			&& $_POST['send'] == 'send'
-		) {
-
-			$ip = validate_ip($_POST['ip']);
-			$port = validate($_POST['port'], 'port', '/^(([1-9])|([1-9][0-9])|([1-9][0-9][0-9])|([1-9][0-9][0-9][0-9])|([1-5][0-9][0-9][0-9][0-9])|(6[0-4][0-9][0-9][0-9])|(65[0-4][0-9][0-9])|(655[0-2][0-9])|(6553[0-5]))$/Di', array('stringisempty', 'myport'));
-			$listen_statement = isset($_POST['listen_statement']) ? 1 : 0;
-			$namevirtualhost_statement = isset($_POST['namevirtualhost_statement']) ? 1 : 0;
-			$vhostcontainer = isset($_POST['vhostcontainer']) ? 1 : 0;
-			$specialsettings = validate(str_replace("\r\n", "\n", $_POST['specialsettings']), 'specialsettings', '/^[^\0]*$/');
-			$vhostcontainer_servername_statement = isset($_POST['vhostcontainer_servername_statement']) ? 1 : 0;
-			$default_vhostconf_domain = validate(str_replace("\r\n", "\n", $_POST['default_vhostconf_domain']), 'default_vhostconf_domain', '/^[^\0]*$/');
-			$docroot = validate($_POST['docroot'], 'docroot');
-
-			if ((int)Settings::Get('system.use_ssl') == 1) {
-				$ssl = isset($_POST['ssl']) ? intval($_POST['ssl']) : 0;
-				$ssl_cert_file = validate($_POST['ssl_cert_file'], 'ssl_cert_file');
-				$ssl_key_file = validate($_POST['ssl_key_file'], 'ssl_key_file');
-				$ssl_ca_file = validate($_POST['ssl_ca_file'], 'ssl_ca_file');
-				$ssl_cert_chainfile = validate($_POST['ssl_cert_chainfile'], 'ssl_cert_chainfile');
-			} else {
-				$ssl = 0;
-				$ssl_cert_file = '';
-				$ssl_key_file = '';
-				$ssl_ca_file = '';
-				$ssl_cert_chainfile = '';
+	} elseif ($action == 'add') {
+		if (isset($_POST['send']) && $_POST['send'] == 'send') {
+			try {
+				IpsAndPorts::getLocal($userinfo, $_POST)->add();
+			} catch (Exception $e) {
+				dynamic_error($e->getMessage());
 			}
-
-			if ($listen_statement != '1') {
-				$listen_statement = '0';
-			}
-
-			if ($namevirtualhost_statement != '1') {
-				$namevirtualhost_statement = '0';
-			}
-
-			if ($vhostcontainer != '1') {
-				$vhostcontainer = '0';
-			}
-
-			if ($vhostcontainer_servername_statement != '1') {
-				$vhostcontainer_servername_statement = '0';
-			}
-
-			if ($ssl != '1') {
-				$ssl = '0';
-			}
-
-			if ($ssl_cert_file != '') {
-				$ssl_cert_file = makeCorrectFile($ssl_cert_file);
-			}
-
-			if ($ssl_key_file != '') {
-				$ssl_key_file = makeCorrectFile($ssl_key_file);
-			}
-
-			if ($ssl_ca_file != '') {
-				$ssl_ca_file = makeCorrectFile($ssl_ca_file);
-			}
-
-			if ($ssl_cert_chainfile != '') {
-				$ssl_cert_chainfile = makeCorrectFile($ssl_cert_chainfile);
-			}
-
-			if (strlen(trim($docroot)) > 0) {
-				$docroot = makeCorrectDir($docroot);
-			} else {
-				$docroot = '';
-			}
-
-			$result_checkfordouble_stmt = Database::prepare("
-				SELECT `id` FROM `" . TABLE_PANEL_IPSANDPORTS . "`
-				WHERE `ip` = :ip AND `port` = :port"
-			);
-			$result_checkfordouble = Database::pexecute_first($result_checkfordouble_stmt, array('ip' => $ip, 'port' => $port));
-
-			if ($result_checkfordouble['id'] != '') {
-				standard_error('myipnotdouble');
-			} else {
-				$ins_stmt = Database::prepare("
-					INSERT INTO `" . TABLE_PANEL_IPSANDPORTS . "`
-					SET
-						`ip` = :ip, `port` = :port, `listen_statement` = :ls,
-						`namevirtualhost_statement` = :nvhs, `vhostcontainer` = :vhc,
-						`vhostcontainer_servername_statement` = :vhcss,
-						`specialsettings` = :ss, `ssl` = :ssl,
-						`ssl_cert_file` = :ssl_cert, `ssl_key_file` = :ssl_key,
-						`ssl_ca_file` = :ssl_ca, `ssl_cert_chainfile` = :ssl_chain,
-						`default_vhostconf_domain` = :dvhd, `docroot` = :docroot;
-				");
-				$ins_data = array(
-					'ip' => $ip,
-					'port' => $port,
-					'ls' => $listen_statement,
-					'nvhs' => $namevirtualhost_statement,
-					'vhc' => $vhostcontainer,
-					'vhcss' => $vhostcontainer_servername_statement,
-					'ss' => $specialsettings,
-					'ssl' => $ssl,
-					'ssl_cert' => $ssl_cert_file,
-					'ssl_key' => $ssl_key_file,
-					'ssl_ca' => $ssl_ca_file,
-					'ssl_chain' => $ssl_cert_chainfile,
-					'dvhd' => $default_vhostconf_domain,
-					'docroot' => $docroot
-				);
-				Database::pexecute($ins_stmt, $ins_data);
-
-				if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
-					$ip = '[' . $ip . ']';
-				}
-
-				$log->logAction(ADM_ACTION, LOG_WARNING, "added IP/port '" . $ip . ":" . $port . "'");
-				inserttask('1');
-				// Using nameserver, insert a task which rebuilds the server config
-				inserttask('4');
-				redirectTo($filename, Array('page' => $page, 's' => $s));
-			}
-
+			redirectTo($filename, array(
+				'page' => $page,
+				's' => $s
+			));
 		} else {
-
-			$ipsandports_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/ipsandports/formfield.ipsandports_add.php';
+			
+			$ipsandports_add_data = include_once dirname(__FILE__) . '/lib/formfields/admin/ipsandports/formfield.ipsandports_add.php';
 			$ipsandports_add_form = htmlform::genHTMLForm($ipsandports_add_data);
-
+			
 			$title = $ipsandports_add_data['ipsandports_add']['title'];
 			$image = $ipsandports_add_data['ipsandports_add']['image'];
-
+			
 			eval("echo \"" . getTemplate("ipsandports/ipsandports_add") . "\";");
 		}
-
-	} elseif($action == 'edit'
-		&& $id != 0
-	) {
-		$result_stmt = Database::prepare("
-			SELECT * FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `id` = :id"
-		);
-		$result = Database::pexecute_first($result_stmt, array('id' => $id));
-
+	} elseif ($action == 'edit' && $id != 0) {
+		try {
+			$json_result = IpsAndPorts::getLocal($userinfo, array(
+				'id' => $id
+			))->get();
+		} catch (Exception $e) {
+			dynamic_error($e->getMessage());
+		}
+		$result = json_decode($json_result, true)['data'];
+		
 		if ($result['ip'] != '') {
-
-			if (isset($_POST['send'])
-				&& $_POST['send'] == 'send'
-			) {
-
-				$ip = validate_ip($_POST['ip']);
-				$port = validate($_POST['port'], 'port', '/^(([1-9])|([1-9][0-9])|([1-9][0-9][0-9])|([1-9][0-9][0-9][0-9])|([1-5][0-9][0-9][0-9][0-9])|(6[0-4][0-9][0-9][0-9])|(65[0-4][0-9][0-9])|(655[0-2][0-9])|(6553[0-5]))$/Di', array('stringisempty', 'myport'));
-				$listen_statement = isset($_POST['listen_statement']) ? 1 : 0;
-				$namevirtualhost_statement = isset($_POST['namevirtualhost_statement']) ? 1 : 0;
-				$vhostcontainer = isset($_POST['vhostcontainer']) ? 1 : 0;
-				$specialsettings = validate(str_replace("\r\n", "\n", $_POST['specialsettings']), 'specialsettings', '/^[^\0]*$/');
-				$vhostcontainer_servername_statement = isset($_POST['vhostcontainer_servername_statement']) ? 1 : 0;
-				$default_vhostconf_domain = validate(str_replace("\r\n", "\n", $_POST['default_vhostconf_domain']), 'default_vhostconf_domain', '/^[^\0]*$/');
-				$docroot =  validate($_POST['docroot'], 'docroot');
-
-				$result_checkfordouble_stmt = Database::prepare("
-					SELECT `id` FROM `" . TABLE_PANEL_IPSANDPORTS . "`
-					WHERE `ip` = :ip AND `port` = :port"
-				);
-				$result_checkfordouble = Database::pexecute_first($result_checkfordouble_stmt, array('ip' => $ip, 'port' => $port));
-
-				$result_sameipotherport_stmt = Database::prepare("
-					SELECT `id` FROM `" . TABLE_PANEL_IPSANDPORTS . "`
-					WHERE `ip` = :ip AND `id` <> :id"
-				);
-				$result_sameipotherport = Database::pexecute_first($result_sameipotherport_stmt, array('ip' => $ip, 'id' => $id));
-
-				if ((int)Settings::Get('system.use_ssl') == 1
-					&& isset($_POST['ssl'])
-					&& $_POST['ssl'] != 0
-				) {
-					$ssl = 1;
-					$ssl_cert_file = validate($_POST['ssl_cert_file'], 'ssl_cert_file');
-					$ssl_key_file = validate($_POST['ssl_key_file'], 'ssl_key_file');
-					$ssl_ca_file = validate($_POST['ssl_ca_file'], 'ssl_ca_file');
-					$ssl_cert_chainfile = validate($_POST['ssl_cert_chainfile'], 'ssl_cert_chainfile');
-				} else {
-					$ssl = 0;
-					$ssl_cert_file = '';
-					$ssl_key_file = '';
-					$ssl_ca_file = '';
-					$ssl_cert_chainfile = '';
-				}
-
-				if ($listen_statement != '1') {
-					$listen_statement = '0';
-				}
-
-				if ($namevirtualhost_statement != '1') {
-					$namevirtualhost_statement = '0';
-				}
-
-				if ($vhostcontainer != '1') {
-					$vhostcontainer = '0';
-				}
-
-				if ($vhostcontainer_servername_statement != '1') {
-					$vhostcontainer_servername_statement = '0';
-				}
-
-				if ($ssl != '1') {
-					$ssl = '0';
-				}
-
-				if ($ssl_cert_file != '') {
-					$ssl_cert_file = makeCorrectFile($ssl_cert_file);
-				}
-
-				if ($ssl_key_file != '') {
-					$ssl_key_file = makeCorrectFile($ssl_key_file);
-				}
-
-				if ($ssl_ca_file != '') {
-					$ssl_ca_file = makeCorrectFile($ssl_ca_file);
-				}
-
-				if ($ssl_cert_chainfile != '') {
-					$ssl_cert_chainfile = makeCorrectFile($ssl_cert_chainfile);
-				}
-
-				if (strlen(trim($docroot)) > 0) {
-					$docroot = makeCorrectDir($docroot);
-				} else {
-					$docroot = '';
-				}
-
-				if ($result['ip'] != $ip
-					&& $result['ip'] == Settings::Get('system.ipaddress')
-					&& $result_sameipotherport['id'] == ''
-				) {
-					standard_error('cantchangesystemip');
-
-				} elseif($result_checkfordouble['id'] != ''
-					&& $result_checkfordouble['id'] != $id
-				) {
-					standard_error('myipnotdouble');
-
-				} else {
-
-					$upd_stmt = Database::prepare("
-						UPDATE `" . TABLE_PANEL_IPSANDPORTS . "`
-						SET
-							`ip` = :ip, `port` = :port, `listen_statement` = :ls,
-							`namevirtualhost_statement` = :nvhs, `vhostcontainer` = :vhc,
-							`vhostcontainer_servername_statement` = :vhcss,
-							`specialsettings` = :ss, `ssl` = :ssl,
-							`ssl_cert_file` = :ssl_cert, `ssl_key_file` = :ssl_key,
-							`ssl_ca_file` = :ssl_ca, `ssl_cert_chainfile` = :ssl_chain,
-							`default_vhostconf_domain` = :dvhd, `docroot` = :docroot
-						WHERE `id` = :id;
-					");
-					$upd_data = array(
-						'ip' => $ip,
-						'port' => $port,
-						'ls' => $listen_statement,
-						'nvhs' => $namevirtualhost_statement,
-						'vhc' => $vhostcontainer,
-						'vhcss' => $vhostcontainer_servername_statement,
-						'ss' => $specialsettings,
-						'ssl' => $ssl,
-						'ssl_cert' => $ssl_cert_file,
-						'ssl_key' => $ssl_key_file,
-						'ssl_ca' => $ssl_ca_file,
-						'ssl_chain' => $ssl_cert_chainfile,
-						'dvhd' => $default_vhostconf_domain,
-						'docroot' => $docroot,
-						'id' => $id
-					);
-					Database::pexecute($upd_stmt, $upd_data);
-
-					$log->logAction(ADM_ACTION, LOG_WARNING, "changed IP/port from '" . $result['ip'] . ":" . $result['port'] . "' to '" . $ip . ":" . $port . "'");
-					inserttask('1');
-
-					// Using nameserver, insert a task which rebuilds the server config
-					inserttask('4');
-
-					redirectTo($filename, Array('page' => $page, 's' => $s));
-				}
-
+			
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
+				try {
+					IpsAndPorts::getLocal($userinfo, $_POST)->update();
+				} catch (Exception $e) {
+					dynamic_error($e->getMessage());
+				}			
+				redirectTo($filename, array(
+					'page' => $page,
+					's' => $s
+				));
 			} else {
-
+				
 				$result = htmlentities_array($result);
-
-				$ipsandports_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php';
+				
+				$ipsandports_edit_data = include_once dirname(__FILE__) . '/lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php';
 				$ipsandports_edit_form = htmlform::genHTMLForm($ipsandports_edit_data);
-
+				
 				$title = $ipsandports_edit_data['ipsandports_edit']['title'];
 				$image = $ipsandports_edit_data['ipsandports_edit']['image'];
-
+				
 				eval("echo \"" . getTemplate("ipsandports/ipsandports_edit") . "\";");
 			}
 		}
diff --git a/lib/classes/api/commands/class.IpsAndPorts.php b/lib/classes/api/commands/class.IpsAndPorts.php
new file mode 100644
index 00000000..502d68a1
--- /dev/null
+++ b/lib/classes/api/commands/class.IpsAndPorts.php
@@ -0,0 +1,393 @@
+<?php
+
+class IpsAndPorts extends ApiCommand
+{
+
+	public function list()
+	{
+		if ($this->isAdmin() && $this->getUserDetail('change_serversettings')) {
+			$this->logger()->logAction(ADM_ACTION, LOG_NOTICE, "[API] list ips and ports");
+			$result_stmt = Database::prepare("
+				SELECT * FROM `" . TABLE_PANEL_IPSANDPORTS . "` ORDER BY `ip` ASC, `port` ASC
+			");
+			Database::pexecute($result_stmt);
+			$result = array();
+			while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
+				$result[] = $row;
+			}
+			return $this->response(200, "successfull", array(
+				'count' => count($result),
+				'list' => $result
+			));
+		}
+		throw new Exception("Not allowed to execute given command.", 403);
+	}
+
+	public function get()
+	{
+		if ($this->isAdmin() && $this->getUserDetail('change_serversettings')) {
+			$id = $this->getParam('id');
+			$this->logger()->logAction(ADM_ACTION, LOG_NOTICE, "[API] get ip and port #" . $id);
+			$result_stmt = Database::prepare("
+				SELECT * FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `id` = :id
+			");
+			$result = Database::pexecute_first($result_stmt, array(
+				'id' => $id
+			), true, true);
+			if ($result) {
+				return $this->response(200, "successfull", $result);
+			}
+			throw new Exception("IP/port with id #" . $id . " could not be found");
+		}
+		throw new Exception("Not allowed to execute given command.", 403);
+	}
+
+	public function add()
+	{
+		if ($this->isAdmin() && $this->getUserDetail('change_serversettings')) {
+			$ip = validate_ip2($this->getParam('ip'), false, 'invalidip', false, false, false, true);
+			$port = validate($this->getParam('port'), 'port', '/^(([1-9])|([1-9][0-9])|([1-9][0-9][0-9])|([1-9][0-9][0-9][0-9])|([1-5][0-9][0-9][0-9][0-9])|(6[0-4][0-9][0-9][0-9])|(65[0-4][0-9][0-9])|(655[0-2][0-9])|(6553[0-5]))$/Di', array(
+				'stringisempty',
+				'myport'
+			), array(), true);
+			$listen_statement = ! empty($this->getParam('listen_statement')) ? 1 : 0;
+			$namevirtualhost_statement = ! empty($this->getParam('namevirtualhost_statement')) ? 1 : 0;
+			$vhostcontainer = ! empty($this->getParam('vhostcontainer')) ? 1 : 0;
+			$specialsettings = validate(str_replace("\r\n", "\n", $this->getParam('specialsettings')), 'specialsettings', '/^[^\0]*$/', '', array(), true);
+			$vhostcontainer_servername_statement = ! empty($this->getParam('vhostcontainer_servername_statement')) ? 1 : 0;
+			$default_vhostconf_domain = validate(str_replace("\r\n", "\n", $this->getParam('default_vhostconf_domain')), 'default_vhostconf_domain', '/^[^\0]*$/', '', array(), true);
+			$docroot = validate($this->getParam('docroot'), 'docroot', '', '', array(), true);
+			
+			if ((int) Settings::Get('system.use_ssl') == 1) {
+				$ssl = ! empty($this->getParam('ssl')) ? intval($this->getParam('ssl')) : 0;
+				$ssl_cert_file = validate($this->getParam('ssl_cert_file'), 'ssl_cert_file', '', '', array(), true);
+				$ssl_key_file = validate($this->getParam('ssl_key_file'), 'ssl_key_file', '', '', array(), true);
+				$ssl_ca_file = validate($this->getParam('ssl_ca_file'), 'ssl_ca_file', '', '', array(), true);
+				$ssl_cert_chainfile = validate($this->getParam('ssl_cert_chainfile'), 'ssl_cert_chainfile', '', '', array(), true);
+			} else {
+				$ssl = 0;
+				$ssl_cert_file = '';
+				$ssl_key_file = '';
+				$ssl_ca_file = '';
+				$ssl_cert_chainfile = '';
+			}
+			
+			if ($listen_statement != '1') {
+				$listen_statement = '0';
+			}
+			
+			if ($namevirtualhost_statement != '1') {
+				$namevirtualhost_statement = '0';
+			}
+			
+			if ($vhostcontainer != '1') {
+				$vhostcontainer = '0';
+			}
+			
+			if ($vhostcontainer_servername_statement != '1') {
+				$vhostcontainer_servername_statement = '0';
+			}
+			
+			if ($ssl != '1') {
+				$ssl = '0';
+			}
+			
+			if ($ssl_cert_file != '') {
+				$ssl_cert_file = makeCorrectFile($ssl_cert_file);
+			}
+			
+			if ($ssl_key_file != '') {
+				$ssl_key_file = makeCorrectFile($ssl_key_file);
+			}
+			
+			if ($ssl_ca_file != '') {
+				$ssl_ca_file = makeCorrectFile($ssl_ca_file);
+			}
+			
+			if ($ssl_cert_chainfile != '') {
+				$ssl_cert_chainfile = makeCorrectFile($ssl_cert_chainfile);
+			}
+			
+			if (strlen(trim($docroot)) > 0) {
+				$docroot = makeCorrectDir($docroot);
+			} else {
+				$docroot = '';
+			}
+			
+			$result_checkfordouble_stmt = Database::prepare("
+			SELECT `id` FROM `" . TABLE_PANEL_IPSANDPORTS . "`
+			WHERE `ip` = :ip AND `port` = :port");
+			$result_checkfordouble = Database::pexecute_first($result_checkfordouble_stmt, array(
+				'ip' => $ip,
+				'port' => $port
+			));
+			
+			if ($result_checkfordouble['id'] != '') {
+				standard_error('myipnotdouble', '', true);
+			}
+			
+			$ins_stmt = Database::prepare("
+				INSERT INTO `" . TABLE_PANEL_IPSANDPORTS . "`
+				SET
+				`ip` = :ip, `port` = :port, `listen_statement` = :ls,
+				`namevirtualhost_statement` = :nvhs, `vhostcontainer` = :vhc,
+				`vhostcontainer_servername_statement` = :vhcss,
+				`specialsettings` = :ss, `ssl` = :ssl,
+				`ssl_cert_file` = :ssl_cert, `ssl_key_file` = :ssl_key,
+				`ssl_ca_file` = :ssl_ca, `ssl_cert_chainfile` = :ssl_chain,
+				`default_vhostconf_domain` = :dvhd, `docroot` = :docroot;
+			");
+			$ins_data = array(
+				'ip' => $ip,
+				'port' => $port,
+				'ls' => $listen_statement,
+				'nvhs' => $namevirtualhost_statement,
+				'vhc' => $vhostcontainer,
+				'vhcss' => $vhostcontainer_servername_statement,
+				'ss' => $specialsettings,
+				'ssl' => $ssl,
+				'ssl_cert' => $ssl_cert_file,
+				'ssl_key' => $ssl_key_file,
+				'ssl_ca' => $ssl_ca_file,
+				'ssl_chain' => $ssl_cert_chainfile,
+				'dvhd' => $default_vhostconf_domain,
+				'docroot' => $docroot
+			);
+			Database::pexecute($ins_stmt, $ins_data);
+			$ins_data['id'] = Database::lastInsertId();
+			
+			inserttask('1');
+			// Using nameserver, insert a task which rebuilds the server config
+			inserttask('4');
+			
+			if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+				$ip = '[' . $ip . ']';
+			}
+			$this->logger()->logAction(ADM_ACTION, LOG_WARNING, "[API] added IP/port '" . $ip . ":" . $port . "'");
+			return $this->response(200, "successfull", $ins_data);
+		}
+		throw new Exception("Not allowed to execute given command.", 403);
+	}
+
+	public function update()
+	{
+		if ($this->isAdmin() && $this->getUserDetail('change_serversettings')) {
+			$id = $this->getParam('id');
+			
+			$result_stmt = Database::prepare("
+			SELECT * FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `id` = :id
+		");
+			$result = Database::pexecute_first($result_stmt, array(
+				'id' => $id
+			), true, true);
+			
+			$ip = validate_ip2($this->getParam('ip'), false, 'invalidip', false, false, false, true);
+			$port = validate($this->getParam('port'), 'port', '/^(([1-9])|([1-9][0-9])|([1-9][0-9][0-9])|([1-9][0-9][0-9][0-9])|([1-5][0-9][0-9][0-9][0-9])|(6[0-4][0-9][0-9][0-9])|(65[0-4][0-9][0-9])|(655[0-2][0-9])|(6553[0-5]))$/Di', array(
+				'stringisempty',
+				'myport'
+			), array(), true);
+			$listen_statement = ! empty($this->getParam('listen_statement')) ? 1 : 0;
+			$namevirtualhost_statement = ! empty($this->getParam('namevirtualhost_statement')) ? 1 : 0;
+			$vhostcontainer = ! empty($this->getParam('vhostcontainer')) ? 1 : 0;
+			$specialsettings = validate(str_replace("\r\n", "\n", $this->getParam('specialsettings')), 'specialsettings', '/^[^\0]*$/', '', array(), true);
+			$vhostcontainer_servername_statement = ! empty($this->getParam('vhostcontainer_servername_statement')) ? 1 : 0;
+			$default_vhostconf_domain = validate(str_replace("\r\n", "\n", $this->getParam('default_vhostconf_domain')), 'default_vhostconf_domain', '/^[^\0]*$/', '', array(), true);
+			$docroot = validate($this->getParam('docroot'), 'docroot', '', '', array(), true);
+			
+			if ((int) Settings::Get('system.use_ssl') == 1) {
+				$ssl = ! empty($this->getParam('ssl')) ? intval($this->getParam('ssl')) : 0;
+				$ssl_cert_file = validate($this->getParam('ssl_cert_file'), 'ssl_cert_file', '', '', array(), true);
+				$ssl_key_file = validate($this->getParam('ssl_key_file'), 'ssl_key_file', '', '', array(), true);
+				$ssl_ca_file = validate($this->getParam('ssl_ca_file'), 'ssl_ca_file', '', '', array(), true);
+				$ssl_cert_chainfile = validate($this->getParam('ssl_cert_chainfile'), 'ssl_cert_chainfile', '', '', array(), true);
+			} else {
+				$ssl = 0;
+				$ssl_cert_file = '';
+				$ssl_key_file = '';
+				$ssl_ca_file = '';
+				$ssl_cert_chainfile = '';
+			}
+			
+			$result_checkfordouble_stmt = Database::prepare("
+			SELECT `id` FROM `" . TABLE_PANEL_IPSANDPORTS . "`
+			WHERE `ip` = :ip AND `port` = :port
+		");
+			$result_checkfordouble = Database::pexecute_first($result_checkfordouble_stmt, array(
+				'ip' => $ip,
+				'port' => $port
+			));
+			
+			$result_sameipotherport_stmt = Database::prepare("
+			SELECT `id` FROM `" . TABLE_PANEL_IPSANDPORTS . "`
+			WHERE `ip` = :ip AND `id` <> :id
+		");
+			$result_sameipotherport = Database::pexecute_first($result_sameipotherport_stmt, array(
+				'ip' => $ip,
+				'id' => $id
+			));
+			
+			if ($listen_statement != '1') {
+				$listen_statement = '0';
+			}
+			
+			if ($namevirtualhost_statement != '1') {
+				$namevirtualhost_statement = '0';
+			}
+			
+			if ($vhostcontainer != '1') {
+				$vhostcontainer = '0';
+			}
+			
+			if ($vhostcontainer_servername_statement != '1') {
+				$vhostcontainer_servername_statement = '0';
+			}
+			
+			if ($ssl != '1') {
+				$ssl = '0';
+			}
+			
+			if ($ssl_cert_file != '') {
+				$ssl_cert_file = makeCorrectFile($ssl_cert_file);
+			}
+			
+			if ($ssl_key_file != '') {
+				$ssl_key_file = makeCorrectFile($ssl_key_file);
+			}
+			
+			if ($ssl_ca_file != '') {
+				$ssl_ca_file = makeCorrectFile($ssl_ca_file);
+			}
+			
+			if ($ssl_cert_chainfile != '') {
+				$ssl_cert_chainfile = makeCorrectFile($ssl_cert_chainfile);
+			}
+			
+			if (strlen(trim($docroot)) > 0) {
+				$docroot = makeCorrectDir($docroot);
+			} else {
+				$docroot = '';
+			}
+			
+			if ($result['ip'] != $ip && $result['ip'] == Settings::Get('system.ipaddress') && $result_sameipotherport['id'] == '') {
+				standard_error('cantchangesystemip', '', true);
+			} elseif ($result_checkfordouble['id'] != '' && $result_checkfordouble['id'] != $id) {
+				standard_error('myipnotdouble', '', true);
+			} else {
+				
+				$upd_stmt = Database::prepare("
+				UPDATE `" . TABLE_PANEL_IPSANDPORTS . "`
+				SET
+				`ip` = :ip, `port` = :port, `listen_statement` = :ls,
+				`namevirtualhost_statement` = :nvhs, `vhostcontainer` = :vhc,
+				`vhostcontainer_servername_statement` = :vhcss,
+				`specialsettings` = :ss, `ssl` = :ssl,
+				`ssl_cert_file` = :ssl_cert, `ssl_key_file` = :ssl_key,
+				`ssl_ca_file` = :ssl_ca, `ssl_cert_chainfile` = :ssl_chain,
+				`default_vhostconf_domain` = :dvhd, `docroot` = :docroot
+				WHERE `id` = :id;
+			");
+				$upd_data = array(
+					'ip' => $ip,
+					'port' => $port,
+					'ls' => $listen_statement,
+					'nvhs' => $namevirtualhost_statement,
+					'vhc' => $vhostcontainer,
+					'vhcss' => $vhostcontainer_servername_statement,
+					'ss' => $specialsettings,
+					'ssl' => $ssl,
+					'ssl_cert' => $ssl_cert_file,
+					'ssl_key' => $ssl_key_file,
+					'ssl_ca' => $ssl_ca_file,
+					'ssl_chain' => $ssl_cert_chainfile,
+					'dvhd' => $default_vhostconf_domain,
+					'docroot' => $docroot,
+					'id' => $id
+				);
+				Database::pexecute($upd_stmt, $upd_data);
+				
+				inserttask('1');
+				// Using nameserver, insert a task which rebuilds the server config
+				inserttask('4');
+				
+				$this->logger()->logAction(ADM_ACTION, LOG_WARNING, "[API] changed IP/port from '" . $result['ip'] . ":" . $result['port'] . "' to '" . $ip . ":" . $port . "'");
+				return $this->response(200, "successfull", $upd_data);
+			}
+		}
+		throw new Exception("Not allowed to execute given command.", 403);
+	}
+
+	public function delete()
+	{
+		if ($this->isAdmin() && $this->getUserDetail('change_serversettings')) {
+			$id = $this->getParam('id');
+			
+			$result_stmt = Database::prepare("
+			SELECT * FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `id` = :id
+		");
+			$result = Database::pexecute_first($result_stmt, array(
+				'id' => $id
+			), true, true);
+			
+			$result_checkdomain_stmt = Database::prepare("
+			SELECT `id_domain` as `id` FROM `" . TABLE_DOMAINTOIP . "` WHERE `id_ipandports` = :id
+		");
+			$result_checkdomain = Database::pexecute_first($result_checkdomain_stmt, array(
+				'id' => $id
+			), true, true);
+			
+			if ($result_checkdomain['id'] == '') {
+				if (! in_array($result['id'], explode(',', Settings::Get('system.defaultip')))) {
+					
+					$result_sameipotherport_stmt = Database::prepare("
+						SELECT `id` FROM `" . TABLE_PANEL_IPSANDPORTS . "`
+						WHERE `ip` = :ip AND `id` <> :id");
+					$result_sameipotherport = Database::pexecute_first($result_sameipotherport_stmt, array(
+						'id' => $id,
+						'ip' => $result['ip']
+					));
+					
+					if (($result['ip'] != Settings::Get('system.ipaddress')) || ($result['ip'] == Settings::Get('system.ipaddress') && $result_sameipotherport['id'] != '')) {
+						$result_stmt = Database::prepare("
+							SELECT `ip`, `port` FROM `" . TABLE_PANEL_IPSANDPORTS . "`
+							WHERE `id` = :id");
+						$result = Database::pexecute_first($result_stmt, array(
+							'id' => $id
+						));
+						if ($result['ip'] != '') {
+							
+							$del_stmt = Database::prepare("
+							DELETE FROM `" . TABLE_PANEL_IPSANDPORTS . "`
+							WHERE `id` = :id
+						");
+							Database::pexecute($del_stmt, array(
+								'id' => $id
+							));
+							
+							// also, remove connections to domains (multi-stack)
+							$del_stmt = Database::prepare("
+							DELETE FROM `" . TABLE_DOMAINTOIP . "` WHERE `id_ipandports` = :id
+						");
+							Database::pexecute($del_stmt, array(
+								'id' => $id
+							));
+							
+							inserttask('1');
+							// Using nameserver, insert a task which rebuilds the server config
+							inserttask('4');
+							
+							$this->logger()->logAction(ADM_ACTION, LOG_WARNING, "[API] deleted IP/port '" . $result['ip'] . ":" . $result['port'] . "'");
+							return $this->response(200, "successfull", $result);
+						}
+					} else {
+						standard_error('cantdeletesystemip', '', true);
+					}
+				} else {
+					standard_error('cantdeletedefaultip', '', true);
+				}
+			} else {
+				standard_error('ipstillhasdomains', '', true);
+			}
+		}
+		throw new Exception("Not allowed to execute given command.", 403);
+	}
+}