From 0d897f13e313bddfefb71dbef43cceb9a5d782f9 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Fri, 6 Aug 2010 08:46:55 +0000 Subject: [PATCH] - prevent "sub-but-full-domain" to be used as "sub-but-full-domain" again --- admin_domains.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/admin_domains.php b/admin_domains.php index d4d04030..7bafaea6 100644 --- a/admin_domains.php +++ b/admin_domains.php @@ -627,16 +627,20 @@ if($page == 'domains' } $domains = makeoption($lng['domains']['noaliasdomain'], 0, NULL, true); - $subtodomains = makeoption($lng['domains']['nosubtomaindomain'], 0, NULL, true); $result_domains = $db->query("SELECT `d`.`id`, `d`.`domain`, `c`.`loginname` FROM `" . TABLE_PANEL_DOMAINS . "` `d`, `" . TABLE_PANEL_CUSTOMERS . "` `c` WHERE `d`.`aliasdomain` IS NULL AND `d`.`parentdomainid`=0 " . $standardsubdomains . ($userinfo['customers_see_all'] ? '' : " AND `d`.`adminid` = '" . (int)$userinfo['adminid'] . "'") . " AND `d`.`customerid`=`c`.`customerid` ORDER BY `loginname`, `domain` ASC"); - $all_domains = ''; while($row_domain = $db->fetch_array($result_domains)) { - $all_domains.= makeoption($idna_convert->decode($row_domain['domain']) . ' (' . $row_domain['loginname'] . ')', $row_domain['id']); + $domains.= makeoption($idna_convert->decode($row_domain['domain']) . ' (' . $row_domain['loginname'] . ')', $row_domain['id']); + } + + $subtodomains = makeoption($lng['domains']['nosubtomaindomain'], 0, NULL, true); + $result_domains = $db->query("SELECT `d`.`id`, `d`.`domain`, `c`.`loginname` FROM `" . TABLE_PANEL_DOMAINS . "` `d`, `" . TABLE_PANEL_CUSTOMERS . "` `c` WHERE `d`.`aliasdomain` IS NULL AND `d`.`parentdomainid`=0 AND `d`.`ismainbutsubto`=0 " . $standardsubdomains . ($userinfo['customers_see_all'] ? '' : " AND `d`.`adminid` = '" . (int)$userinfo['adminid'] . "'") . " AND `d`.`customerid`=`c`.`customerid` ORDER BY `loginname`, `domain` ASC"); + + while($row_domain = $db->fetch_array($result_domains)) + { + $subtodomains.= makeoption($idna_convert->decode($row_domain['domain']) . ' (' . $row_domain['loginname'] . ')', $row_domain['id']); } - $domains .= $all_domains; - $subtodomains .= $all_domains; $phpconfigs = ''; $configs = $db->query("SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "`");