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

fixes when adding a user with std.subdomain (multi-stack related)

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2013-09-24 17:32:40 +02:00
parent bacf60df59
commit a993295356
1 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
admin_customers.php
View File

@@ -812,7 +812,6 @@ if($page == 'customers'
"`customerid` = '" . (int)$customerid . "', " . "`customerid` = '" . (int)$customerid . "', " .
"`adminid` = '" . (int)$userinfo['adminid'] . "', " . "`adminid` = '" . (int)$userinfo['adminid'] . "', " .
"`parentdomainid` = '-1', " . "`parentdomainid` = '-1', " .
"`ipandport` = '" . $db->escape($settings['system']['defaultip']) . "', " .
"`documentroot` = '" . $db->escape($documentroot) . "', " . "`documentroot` = '" . $db->escape($documentroot) . "', " .
"`zonefile` = '', " . "`zonefile` = '', " .
"`isemaildomain` = '0', " . "`isemaildomain` = '0', " .
@@ -822,6 +821,12 @@ if($page == 'customers'
"`specialsettings` = '', " . "`specialsettings` = '', " .
"`add_date` = '".date('Y-m-d')."'"); "`add_date` = '".date('Y-m-d')."'");
$domainid = $db->insert_id(); $domainid = $db->insert_id();
// set ip <-> domain connection
$db->query("INSERT INTO `".TABLE_DOMAINTOIP."` SET
`id_domain` = '".$domainid."',
`id_ipandports` = '".(int)$settings['system']['defaultip']."'"
);
$db->query('UPDATE `' . TABLE_PANEL_CUSTOMERS . '` SET `standardsubdomain`=\'' . (int)$domainid . '\' WHERE `customerid`=\'' . (int)$customerid . '\''); $db->query('UPDATE `' . TABLE_PANEL_CUSTOMERS . '` SET `standardsubdomain`=\'' . (int)$domainid . '\' WHERE `customerid`=\'' . (int)$customerid . '\'');
$log->logAction(ADM_ACTION, LOG_NOTICE, "automatically added standardsubdomain for user '" . $loginname . "'"); $log->logAction(ADM_ACTION, LOG_NOTICE, "automatically added standardsubdomain for user '" . $loginname . "'");
inserttask('1'); inserttask('1');
@@ -1157,9 +1162,30 @@ if($page == 'customers'
$_stdsubdomain = $result['loginname'] . '.' . $settings['system']['hostname']; $_stdsubdomain = $result['loginname'] . '.' . $settings['system']['hostname'];
} }
$db->query("INSERT INTO `" . TABLE_PANEL_DOMAINS . "` " . "(`domain`, `customerid`, `adminid`, `parentdomainid`, `ipandport`, `documentroot`, `zonefile`, `isemaildomain`, `caneditdomain`, `openbasedir`, `speciallogfile`, `specialsettings`, `add_date`) " . "VALUES ('" . $db->escape($_stdsubdomain) . "', '" . (int)$result['customerid'] . "', '" . (int)$userinfo['adminid'] . "', '-1', '" . $db->escape($settings['system']['defaultip']) . "', '" . $db->escape($result['documentroot']) . "', '', '0', '0', '1', '0', '', '".date('Y-m-d')."')"); $db->query("INSERT INTO `" . TABLE_PANEL_DOMAINS . "` SET
`domain` = '" . $db->escape($_stdsubdomain) . "',
`customerid` = '" . (int)$result['customerid'] . "',
`adminid` = '" . (int)$userinfo['adminid'] . "',
`parentdomainid` = '-1',
`documentroot` = '" . $db->escape($result['documentroot']) . "',
`zonefile` = '',
`isemaildomain` = '0',
`caneditdomain` = '0',
`openbasedir` = '1',
`speciallogfile` = '0',
`specialsettings` = '',
`add_date` = '".date('Y-m-d')."'"
);
$domainid = $db->insert_id(); $domainid = $db->insert_id();
$db->query('UPDATE `' . TABLE_PANEL_CUSTOMERS . '` SET `standardsubdomain`=\'' . (int)$domainid . '\' WHERE `customerid`=\'' . (int)$result['customerid'] . '\''); // set ip <-> domain connection
$db->query("INSERT INTO `".TABLE_DOMAINTOIP."` SET
`id_domain` = '".$domainid."',
`id_ipandports` = '".(int)$settings['system']['defaultip']."'"
);
$db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET
`standardsubdomain`='" . (int)$domainid . "'
WHERE `customerid`='" . (int)$result['customerid'] . "'"
);
$log->logAction(ADM_ACTION, LOG_NOTICE, "automatically added standardsubdomain for user '" . $result['loginname'] . "'"); $log->logAction(ADM_ACTION, LOG_NOTICE, "automatically added standardsubdomain for user '" . $result['loginname'] . "'");
inserttask('1'); inserttask('1');
} }
@@ -1167,8 +1193,12 @@ if($page == 'customers'
if($createstdsubdomain == '0' if($createstdsubdomain == '0'
&& $result['standardsubdomain'] != '0') && $result['standardsubdomain'] != '0')
{ {
$db->query('DELETE FROM `' . TABLE_PANEL_DOMAINS . '` WHERE `id`=\'' . (int)$result['standardsubdomain'] . '\''); $db->query("DELETE FROM `" . TABLE_PANEL_DOMAINS . "`
$db->query('UPDATE `' . TABLE_PANEL_CUSTOMERS . '` SET `standardsubdomain`=\'0\' WHERE `customerid`=\'' . (int)$result['customerid'] . '\''); WHERE `id`='" . (int)$result['standardsubdomain'] . "'");
$db->query("DELETE FROM `" . TABLE_DOMAINTOIP . "`
WHERE `id_domain`='" . (int)$result['standardsubdomain'] . "'");
$db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET
`standardsubdomain`= '0' WHERE `customerid`= '" . (int)$result['customerid'] . "'");
$log->logAction(ADM_ACTION, LOG_NOTICE, "automatically deleted standardsubdomain for user '" . $result['loginname'] . "'"); $log->logAction(ADM_ACTION, LOG_NOTICE, "automatically deleted standardsubdomain for user '" . $result['loginname'] . "'");
inserttask('1'); inserttask('1');
} }