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

fix Domains.update() with correct path and change_serversettings=0; refs #1001

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2021-11-27 22:06:29 +01:00
parent cb0b537f6c
commit 149c0935fa
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/Froxlor/Api/Commands/Domains.php
View File

@@ -1274,7 +1274,6 @@ class Domains extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\ResourceEn
$notryfiles = $result['notryfiles']; $notryfiles = $result['notryfiles'];
$writeaccesslog = $result['writeaccesslog']; $writeaccesslog = $result['writeaccesslog'];
$writeerrorlog = $result['writeerrorlog']; $writeerrorlog = $result['writeerrorlog'];
$documentroot = $result['documentroot'];
$ssl_protocols = $p_ssl_protocols; $ssl_protocols = $p_ssl_protocols;
$override_tls = $result['override_tls']; $override_tls = $result['override_tls'];
} }

5
tests/Domains/DomainsTest.php
View File

@@ -172,12 +172,14 @@ class DomainsTest extends TestCase
$reseller_userdata['adminsession'] = 1; $reseller_userdata['adminsession'] = 1;
$data = [ $data = [
'domainname' => 'test2.local', 'domainname' => 'test2.local',
'ssl_protocols' => 'TLSv1' 'ssl_protocols' => 'TLSv1',
'documentroot' => '/var/customers/webs/test1/sub/'
]; ];
$json_result = Domains::getLocal($reseller_userdata, $data)->update(); $json_result = Domains::getLocal($reseller_userdata, $data)->update();
$result = json_decode($json_result, true)['data']; $result = json_decode($json_result, true)['data'];
$this->assertEmpty($result['ssl_protocols']); $this->assertEmpty($result['ssl_protocols']);
$this->assertEquals('test2.local', $result['domain']); $this->assertEquals('test2.local', $result['domain']);
$this->assertEquals('/var/customers/webs/test1/sub/', $result['documentroot']);
} }
/** /**
@@ -442,6 +444,7 @@ class DomainsTest extends TestCase
} }
/** /**
*
* @refs https://github.com/Froxlor/Froxlor/issues/899 * @refs https://github.com/Froxlor/Froxlor/issues/899
*/ */
public function testAdminIdn2DomainsAdd() public function testAdminIdn2DomainsAdd()