diff --git a/lib/classes/api/commands/class.Customers.php b/lib/classes/api/commands/class.Customers.php index 29acb6ff..83fbb373 100644 --- a/lib/classes/api/commands/class.Customers.php +++ b/lib/classes/api/commands/class.Customers.php @@ -517,19 +517,9 @@ class Customers extends ApiCommand implements ResourceEntity 'domain' => $_stdsubdomain, 'customerid' => $customerid, 'adminid' => $this->getUserDetail('adminid'), - 'parentdomainid' => '0', 'docroot' => $documentroot, - 'adddate' => time(), 'phpenabled' => $phpenabled, - 'zonefile' => '', - 'isemaildomain' => '0', - 'caneditdomain' => '0', - 'openbasedir' => '1', - 'speciallogfile' => '0', - 'dkim_id' => '0', - 'dkim_privkey' => '', - 'dkim_pubkey' => '', - 'ipandport' => explode(',', Settings::Get('system.defaultip')) + 'openbasedir' => '1' ); $domainid = - 1; try { @@ -759,18 +749,9 @@ class Customers extends ApiCommand implements ResourceEntity 'domain' => $_stdsubdomain, 'customerid' => $result['customerid'], 'adminid' => $this->getUserDetail('adminid'), - 'parentdomainid' => '0', 'docroot' => $result['documentroot'], - 'adddate' => time(), 'phpenabled' => $phpenabled, - 'zonefile' => '', - 'isemaildomain' => '0', - 'caneditdomain' => '0', 'openbasedir' => '1', - 'speciallogfile' => '0', - 'dkim_id' => '0', - 'dkim_privkey' => '', - 'dkim_pubkey' => '', 'ipandport' => explode(',', Settings::Get('system.defaultip')) ); $domainid = - 1; diff --git a/lib/classes/api/commands/class.Domains.php b/lib/classes/api/commands/class.Domains.php index c25b4d64..e3ae5878 100644 --- a/lib/classes/api/commands/class.Domains.php +++ b/lib/classes/api/commands/class.Domains.php @@ -97,9 +97,9 @@ class Domains extends ApiCommand implements ResourceEntity // parameters $p_domain = $this->getParam('domain'); $customerid = intval($this->getParam('customerid')); - $p_ipandports = $this->getParam('ipandport'); // optional parameters + $p_ipandports = $this->getParam('ipandport', true, explode(',', Settings::Get('system.defaultip'))); $adminid = intval($this->getParam('adminid', true, $this->getUserDetail('adminid'))); $subcanemaildomain = $this->getParam('subcanemaildomain', true, 0); $isemaildomain = $this->getParam('isemaildomain', true, 0); @@ -310,7 +310,11 @@ class Domains extends ApiCommand implements ResourceEntity $additional_ip_condition = ''; $aip_param = array(); } - + + if (empty($p_ipandports)) { + throw new Exception("No IPs given, unable to add domain (no default IPs set?", 406); + } + $ipandports = array(); if (! empty($p_ipandport) && ! is_array($p_ipandports)) { $p_ipandports = unserialize($p_ipandports);