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

fixes in move-domain-to-another-customer functionality in Domains.update

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2018-03-03 21:10:58 +01:00
parent 826f1378d2
commit 0d7afc5c24
2 changed files with 49 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -201,7 +201,7 @@ class Domains extends ApiCommand implements ResourceEntity
if (Settings::Get('system.documentroot_use_default_value') == 1) { if (Settings::Get('system.documentroot_use_default_value') == 1) {
$path_suffix = '/' . $domain; $path_suffix = '/' . $domain;
} }
$documentroot = makeCorrectDir($customer['documentroot'] . $path_suffix); $_documentroot = makeCorrectDir($customer['documentroot'] . $path_suffix);
$registration_date = validate($registration_date, 'registration_date', '/^(19|20)\d\d[-](0[1-9]|1[012])[-](0[1-9]|[12][0-9]|3[01])$/', '', array( $registration_date = validate($registration_date, 'registration_date', '/^(19|20)\d\d[-](0[1-9]|1[012])[-](0[1-9]|[12][0-9]|3[01])$/', '', array(
'0000-00-00', '0000-00-00',
@@ -236,10 +236,10 @@ class Domains extends ApiCommand implements ResourceEntity
// set default path to subdomain or domain name // set default path to subdomain or domain name
if ($documentroot != '') { if ($documentroot != '') {
if (substr($documentroot, 0, 1) != '/' && ! preg_match('/^https?\:\/\//', $documentroot)) { if (substr($documentroot, 0, 1) != '/' && ! preg_match('/^https?\:\/\//', $documentroot)) {
$documentroot .= '/' . $documentroot; $documentroot = $_documentroot . '/' . $documentroot;
} }
} elseif ($documentroot == '' && Settings::Get('system.documentroot_use_default_value') == 1) { } else {
$documentroot = makeCorrectDir($customer['documentroot'] . '/' . $domain); $documentroot = $_documentroot;
} }
} else { } else {
$isbinddomain = '0'; $isbinddomain = '0';
@@ -251,6 +251,7 @@ class Domains extends ApiCommand implements ResourceEntity
$dkim = '0'; $dkim = '0';
$specialsettings = ''; $specialsettings = '';
$notryfiles = '0'; $notryfiles = '0';
$documentroot = $_documentroot;
} }
if ($this->getUserDetail('caneditphpsettings') == '1' || $this->getUserDetail('change_serversettings') == '1') { if ($this->getUserDetail('caneditphpsettings') == '1' || $this->getUserDetail('change_serversettings') == '1') {
@@ -968,7 +969,19 @@ class Domains extends ApiCommand implements ResourceEntity
$specialsettings = validate(str_replace("\r\n", "\n", $specialsettings), 'specialsettings', '/^[^\0]*$/', '', array(), true); $specialsettings = validate(str_replace("\r\n", "\n", $specialsettings), 'specialsettings', '/^[^\0]*$/', '', array(), true);
$documentroot = validate($documentroot, 'documentroot', '', '', array(), true); $documentroot = validate($documentroot, 'documentroot', '', '', array(), true);
// when moving customer and no path is specified, update would normally reuse the current document-root
// which would point to the wrong customer, therefore we will re-create that directory
if (!empty($documentroot) && $customerid > 0 && $customerid != $result['customerid'] && Settings::Get('panel.allow_domain_change_customer') == '1') {
if (Settings::Get('system.documentroot_use_default_value') == 1) {
$_documentroot = makeCorrectDir($customer['documentroot'] . '/' . $result['domain']);
} else {
$_documentroot = $customer['documentroot'];
}
// set the customers default docroot
$documentroot = $_documentroot;
}
if ($documentroot == '') { if ($documentroot == '') {
// 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

32
tests/Domains/DomainsTest.php
View File

@@ -165,8 +165,33 @@ class DomainsTest extends TestCase
Domains::getLocal($admin_userdata, $data)->update(); Domains::getLocal($admin_userdata, $data)->update();
} }
public function testAdminDomainsMove()
{
global $admin_userdata;
// add new customer
$data = [
'new_loginname' => 'test3',
'email' => 'test3@froxlor.org',
'firstname' => 'Test',
'name' => 'Testman',
'customernumber' => 1339,
'new_customer_password' => 'h0lYmo1y'
];
$json_result = Customers::getLocal($admin_userdata, $data)->add();
$customer_userdata = json_decode($json_result, true)['data'];
$data = [
'domainname' => 'test.local',
'customerid' => $customer_userdata['customerid']
];
$json_result =Domains::getLocal($admin_userdata, $data)->update();
$result = json_decode($json_result, true)['data'];
$this->assertEquals($customer_userdata['customerid'], $result['customerid']);
$this->assertEquals($customer_userdata['documentroot'].'test.local/', $result['documentroot']);
}
/** /**
* @depends testAdminDomainsMoveButUnknownCustomer * @depends testAdminDomainsMove
*/ */
public function testAdminDomainsDelete() public function testAdminDomainsDelete()
{ {
@@ -178,6 +203,11 @@ class DomainsTest extends TestCase
$json_result = Domains::getLocal($admin_userdata, $data)->delete(); $json_result = Domains::getLocal($admin_userdata, $data)->delete();
$result = json_decode($json_result, true)['data']; $result = json_decode($json_result, true)['data'];
$this->assertEquals('test.local', $result['domain']); $this->assertEquals('test.local', $result['domain']);
// remove customer again
$json_result = Customers::getLocal($admin_userdata, array(
'loginname' => 'test3'
))->delete();
} }
} }