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

minor fixes and first tests for Domains-ApiCommand

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2018-03-01 16:46:47 +01:00
parent 2bf5e90a77
commit 02616d3080
4 changed files with 92 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -183,10 +183,6 @@ class Domains extends ApiCommand implements ResourceEntity
))->get();
$customer = json_decode($json_result, true)['data'];
if (empty($customer) || $customer['customerid'] != $customerid) {
standard_error('customerdoesntexist', '', true);
}
if ($this->getUserDetail('customers_see_all') == '1') {
$admin_stmt = Database::prepare("
SELECT * FROM `" . TABLE_PANEL_ADMINS . "`
@@ -194,10 +190,6 @@ class Domains extends ApiCommand implements ResourceEntity
$admin = Database::pexecute_first($admin_stmt, array(
'adminid' => $adminid
), true, true);
if (empty($admin) || $admin['adminid'] != $adminid) {
standard_error('admindoesntexist', '', true);
}
} else {
$adminid = $this->getUserDetail('adminid');
$admin = $this->getUserData();

11
lib/functions/froxlor/function.getIpPortCombinations.php
View File

@@ -26,13 +26,12 @@ function getIpPortCombinations($ssl = false) {
if ($userinfo['ip'] != '-1') {
$admin_ip_stmt = Database::prepare("
SELECT `id`, `ip`, `port` FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `id` = :ipid
SELECT `id`, `ip`, `port` FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `id` = IN (:ipid)
");
$admin_ip = Database::pexecute_first($admin_ip_stmt, array('ipid' => $userinfo['ip']));
$additional_conditions_array[] = "`ip` = :adminip";
$additional_conditions_params['adminip'] = $admin_ip['ip'];
$admin_ip = null;
$myips = implode(",", json_decode($userinfo['ip'], true));
Database::pexecute($admin_ip_stmt, array('ipid' => $myips));
$additional_conditions_array[] = "`ip` IN (:adminips)";
$additional_conditions_params['adminips'] = $myips;
}
if ($ssl !== null) {