From b3280e2264e127474f00ce3fe0f6e03190442ea2 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Sun, 29 Sep 2013 18:15:46 +0200 Subject: [PATCH] use same aliasdomain-check queryin 'add' like we do in 'edit' of domains Signed-off-by: Michael Kaufmann (d00p) --- admin_domains.php | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/admin_domains.php b/admin_domains.php index 1267d4f3..4363493a 100644 --- a/admin_domains.php +++ b/admin_domains.php @@ -493,22 +493,12 @@ if($page == 'domains' while ($origip = $db->fetch_array($origipresult)) { $ipandports[] = $origip['id_ipandports']; } - - // also check ip/port combination to be the same, #176 - // 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."'" - ); - */ + $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 . "'"); } if(count($ipandports) == 0)