From 879302623b1697725ef439319b0721bf7aa1afdb Mon Sep 17 00:00:00 2001
From: "Michael Kaufmann (d00p)" <d00p@froxlor.org>
Date: Sun, 29 Sep 2013 15:08:45 +0200
Subject: [PATCH] dirty fix for adding new domains when alias-domain is set
 (IP-check etc. were not done in tilman19-master branch), I'll get into that
 later

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
---
 admin_domains.php | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/admin_domains.php b/admin_domains.php
index 9126dabb..1267d4f3 100644
--- a/admin_domains.php
+++ b/admin_domains.php
@@ -475,23 +475,40 @@ if($page == 'domains'
 					}
 				}
 
-				$domain_check = $db->query_first("SELECT `id`, `domain` FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `domain` = '" . $db->escape(strtolower($domain)) . "'");
+				$domain_check = $db->query_first("SELECT `id`, `domain`
+						FROM `" . TABLE_PANEL_DOMAINS . "`
+						WHERE `domain` = '" . $db->escape(strtolower($domain)) . "'"
+				);
 				$aliasdomain_check = array(
 					'id' => 0
 				);
 
-				if($aliasdomain != 0)
-				{
+				if ($aliasdomain != 0) {
 					// Overwrite given ipandports with these of the "main" domain
 					$ipandports = array();
-					$origipresult = $db->query("SELECT `id_ipandports` FROM `" . TABLE_DOMAINTOIP ."` WHERE `id_domain` = '" . (int)$aliasdomain . "'");
-					while($origip = $db->fetch_array($origipresult))
-					{
+					$origipresult = $db->query("SELECT `id_ipandports`
+						FROM `" . TABLE_DOMAINTOIP ."`
+						WHERE `id_domain` = '" . (int)$aliasdomain . "'"
+					);
+					while ($origip = $db->fetch_array($origipresult)) {
 						$ipandports[] = $origip['id_ipandports'];
 					}
 
 					// also check ip/port combination to be the same, #176
-					$aliasdomain_check = $db->query_first('SELECT `d`.`id` FROM `' . TABLE_PANEL_DOMAINS . '` `d`,`' . TABLE_PANEL_CUSTOMERS . '` `c` WHERE `d`.`customerid`=\'' . (int)$customerid . '\' AND `d`.`aliasdomain` IS NULL AND `d`.`id`<>`c`.`standardsubdomain` AND `c`.`customerid`=\'' . (int)$customerid . '\' AND `d`.`id`=\'' . (int)$aliasdomain . '\' AND `d`.`ipandport` = \''.(int)$ipandport.'\'');
+					// FIXME this thing is weird
+					$aliasdomain_check['id'] = $aliasdomain;
+					/*
+					$aliasdomain_check = $db->query_first(
+						"SELECT `d`.`id` FROM `" . TABLE_PANEL_DOMAINS . "` `d`,
+							`" . TABLE_PANEL_CUSTOMERS . "` `c`,
+						WHERE `d`.`customerid`='" . (int)$customerid . "'
+						AND `d`.`aliasdomain` IS NULL
+						AND `d`.`id` <> `c`.`standardsubdomain`
+						AND `c`.`customerid`='" . (int)$customerid . "'
+						AND `d`.`id`= '" . (int)$aliasdomain . "'
+						AND `d`.`ipandport` = '".(int)$ipandport."'"
+					);
+					*/
 				}
 
 				if(count($ipandports) == 0)