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

optimized CustomersTest and DomainsTest; minor fixes in SubDomains-ApiCommand; added more tests for SubDomains-Command

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2018-03-02 15:24:46 +01:00
parent aeb8655cc3
commit 594512404f
4 changed files with 120 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/classes/api/commands/class.SubDomains.php
View File

@@ -388,7 +388,7 @@ class SubDomains extends ApiCommand implements ResourceEntity
} else {
$result_stmt = Database::prepare("
SELECT * FROM `" . TABLE_PANEL_DOMAINS . "`
WHERE " . ($id > 0 ? "`id` = :iddn" : "`domainname` = :iddn"));
WHERE " . ($id > 0 ? "`id` = :iddn" : "`domain` = :iddn"));
$params = array(
'iddn' => ($id <= 0 ? $domainname : $id)
);
@@ -398,8 +398,8 @@ class SubDomains extends ApiCommand implements ResourceEntity
throw new Exception("You cannot access this resource", 405);
}
$result_stmt = Database::prepare("
SELECT `id`, `customerid`, `domain`, `documentroot`, `isemaildomain`, `parentdomainid`, `aliasdomain` FROM `" . TABLE_PANEL_DOMAINS . "`
WHERE `customerid`= :customerid AND " . ($id > 0 ? "`id` = :iddn" : "`domainname` = :iddn"));
SELECT `id`, `customerid`, `domain`, `documentroot`, `isemaildomain`, `parentdomainid`, `aliasdomain`, `caneditdomain` FROM `" . TABLE_PANEL_DOMAINS . "`
WHERE `customerid`= :customerid AND " . ($id > 0 ? "`id` = :iddn" : "`domain` = :iddn"));
$params = array(
'customerid' => $this->getUserDetail('customerid'),
'iddn' => ($id <= 0 ? $domainname : $id)
@@ -427,7 +427,7 @@ class SubDomains extends ApiCommand implements ResourceEntity
$customerid = $this->getParam('customerid', true, 0);
$loginname = $this->getParam('loginname', true, '');
if (! empty($customer_id) || ! empty($loginname)) {
if (! empty($customerid) || ! empty($loginname)) {
$json_result = Customers::getLocal($this->getUserData(), array(
'id' => $customerid,
'loginname' => $loginname