maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

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

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2013-09-29 15:08:45 +02:00
parent 94478d7ebc
commit 879302623b
1 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
admin_domains.php
View File

@@ -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)