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

fix sql query in Domains.get; minor fixes in Domains.update; first unit-test for Domains.update

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2018-03-01 19:59:27 +01:00
parent 601d16b17c
commit aeb8655cc3
2 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,7 +87,7 @@ class Domains extends ApiCommand implements ResourceEntity
FROM `" . TABLE_PANEL_DOMAINS . "` `d` FROM `" . TABLE_PANEL_DOMAINS . "` `d`
LEFT JOIN `" . TABLE_PANEL_CUSTOMERS . "` `c` USING(`customerid`) LEFT JOIN `" . TABLE_PANEL_CUSTOMERS . "` `c` USING(`customerid`)
WHERE `d`.`parentdomainid` = '0' WHERE `d`.`parentdomainid` = '0'
AND " . ($id > 0 ? "`d`.`id` = :iddn" : "`d`.`domain` = :iddn") . ($no_std_subdomain ? ' AND `d.`id` <> `c`.`standardsubdomain`' : '') . ($this->getUserDetail('customers_see_all') ? '' : " AND `d`.`adminid` = :adminid")); AND " . ($id > 0 ? "`d`.`id` = :iddn" : "`d`.`domain` = :iddn") . ($no_std_subdomain ? ' AND `d`.`id` <> `c`.`standardsubdomain`' : '') . ($this->getUserDetail('customers_see_all') ? '' : " AND `d`.`adminid` = :adminid"));
$params = array( $params = array(
'iddn' => ($id <= 0 ? $domainname : $id) 'iddn' => ($id <= 0 ? $domainname : $id)
); );
@@ -818,7 +818,7 @@ class Domains extends ApiCommand implements ResourceEntity
$letsencrypt = $this->getParam('letsencrypt', true, $result['letsencrypt']); $letsencrypt = $this->getParam('letsencrypt', true, $result['letsencrypt']);
$p_ssl_ipandports = $this->getParam('ssl_ipandport', true, array()); $p_ssl_ipandports = $this->getParam('ssl_ipandport', true, array());
$http2 = $this->getParam('http2', true, $result['http2']); $http2 = $this->getParam('http2', true, $result['http2']);
$hsts_maxage = $this->getParam('hsts_maxage', true, $result['hsts_maxage']); $hsts_maxage = $this->getParam('hsts_maxage', true, $result['hsts']);
$hsts_sub = $this->getParam('hsts_sub', true, $result['hsts_sub']); $hsts_sub = $this->getParam('hsts_sub', true, $result['hsts_sub']);
$hsts_preload = $this->getParam('hsts_preload', true, $result['hsts_preload']); $hsts_preload = $this->getParam('hsts_preload', true, $result['hsts_preload']);
$ocsp_stapling = $this->getParam('ocsp_stapling', true, $result['ocsp_stapling']); $ocsp_stapling = $this->getParam('ocsp_stapling', true, $result['ocsp_stapling']);
@@ -985,6 +985,9 @@ class Domains extends ApiCommand implements ResourceEntity
} }
$ipandports = array(); $ipandports = array();
if (! empty($p_ipandports) && is_numeric($p_ipandports)) {
$p_ipandports = array($p_ipandports);
}
if (! empty($p_ipandports) && ! is_array($p_ipandports)) { if (! empty($p_ipandports) && ! is_array($p_ipandports)) {
$p_ipandports = unserialize($p_ipandports); $p_ipandports = unserialize($p_ipandports);
} }
@@ -1007,6 +1010,18 @@ class Domains extends ApiCommand implements ResourceEntity
$ipandports[] = $ipandport; $ipandports[] = $ipandport;
} }
} }
} else {
// set currently used ip's
$ipsresult_stmt = Database::prepare("
SELECT `id_ipandports` FROM `" . TABLE_DOMAINTOIP . "` WHERE `id_domain` = :id
");
Database::pexecute($ipsresult_stmt, array(
'id' => $result['id']
));
$usedips = array();
while ($ipsresultrow = $ipsresult_stmt->fetch(PDO::FETCH_ASSOC)) {
$ipandports[] = $ipsresultrow['id_ipandports'];
}
} }
if (Settings::Get('system.use_ssl') == '1' && ! empty($p_ssl_ipandports)) { if (Settings::Get('system.use_ssl') == '1' && ! empty($p_ssl_ipandports)) {

17
tests/Domains/DomainsTest.php
View File

@@ -131,7 +131,22 @@ class DomainsTest extends TestCase
} }
/** /**
* @depends testAdminDomainsList * @depends testAdminDomainsAdd
*/
public function testAdminDomainsUpdate()
{
global $admin_userdata;
$data = [
'domainname' => 'test.local',
'email_only' => 1
];
$json_result = Domains::getLocal($admin_userdata, $data)->update();
$result = json_decode($json_result, true)['data'];
$this->assertEquals(1, $result['email_only']);
}
/**
* @depends testAdminDomainsUpdate
*/ */
public function testAdminDomainsDelete() public function testAdminDomainsDelete()
{ {