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

tiny fixes in Domains.add and Domains.update

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2018-02-24 16:26:47 +01:00
parent 87912a9e07
commit bda652f947
1 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/classes/api/commands/class.Domains.php
View File

@@ -182,16 +182,10 @@ class Domains extends ApiCommand implements ResourceEntity
), '', true); ), '', true);
} }
$customer_stmt = Database::prepare(" $json_result = Customers::getLocal($this->getUserData(), array(
SELECT * FROM `" . TABLE_PANEL_CUSTOMERS . "` 'id' => $customerid
WHERE `customerid` = :customerid " . ($this->getUserDetail('customers_see_all') ? '' : " AND `adminid` = :adminid")); ))->get();
$params = array( $customer = json_decode($json_result, true)['data'];
'customerid' => $customerid
);
if ($this->getUserDetail('customers_see_all') == '0') {
$params['adminid'] = $this->getUserDetail('adminid');
}
$customer = Database::pexecute_first($customer_stmt, $params, true, true);
if (empty($customer) || $customer['customerid'] != $customerid) { if (empty($customer) || $customer['customerid'] != $customerid) {
standard_error('customerdoesntexist', '', true); standard_error('customerdoesntexist', '', true);
@@ -860,13 +854,8 @@ class Domains extends ApiCommand implements ResourceEntity
$params['adminid'] = $this->getUserDetail('adminid'); $params['adminid'] = $this->getUserDetail('adminid');
} }
// get domains customer $result = Database::pexecute_first($customer_stmt, $params, true, true);
$json_result = Customers::getLocal($this->getUserData(), array( if (empty($result) || $result['customerid'] != $customerid) {
'id' => $result['customerid']
))->get();
$customer = json_decode($json_result, true)['data'];
if (empty($customer) || $customer['customerid'] != $customerid) {
standard_error('customerdoesntexist', '', true); standard_error('customerdoesntexist', '', true);
} }
} else { } else {
@@ -943,9 +932,9 @@ class Domains extends ApiCommand implements ResourceEntity
// If path is empty and 'Use domain name as default value for DocumentRoot path' is enabled in settings, // If path is empty and 'Use domain name as default value for DocumentRoot path' is enabled in settings,
// set default path to subdomain or domain name // set default path to subdomain or domain name
if (Settings::Get('system.documentroot_use_default_value') == 1) { if (Settings::Get('system.documentroot_use_default_value') == 1) {
$documentroot = makeCorrectDir($customer['documentroot'] . '/' . $result['domain']); $documentroot = makeCorrectDir($result['documentroot'] . '/' . $result['domain']);
} else { } else {
$documentroot = $customer['documentroot']; $documentroot = $result['documentroot'];
} }
} }