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

use same aliasdomain-check queryin 'add' like we do in 'edit' of domains

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

22
admin_domains.php
View File

@@ -493,22 +493,12 @@ if($page == 'domains'
while ($origip = $db->fetch_array($origipresult)) { while ($origip = $db->fetch_array($origipresult)) {
$ipandports[] = $origip['id_ipandports']; $ipandports[] = $origip['id_ipandports'];
} }
$aliasdomain_check = $db->query_first("SELECT `d`.`id` FROM `" . TABLE_PANEL_DOMAINS . "` `d`, `" . TABLE_PANEL_CUSTOMERS . "` `c`
// also check ip/port combination to be the same, #176 WHERE `d`.`customerid`='" . (int)$customerid . "'
// FIXME this thing is weird AND `d`.`aliasdomain` IS NULL AND
$aliasdomain_check['id'] = $aliasdomain; `d`.`id` <> `c`.`standardsubdomain`
/* AND `c`.`customerid`='" . (int)$customerid . "'
$aliasdomain_check = $db->query_first( AND `d`.`id`='" . (int)$aliasdomain . "'");
"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) if(count($ipandports) == 0)