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

fix prepending of domain-name to domain.documentroot if admin has 'edit-server-settings == false' when adding a new domain

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2014-04-12 09:37:51 +02:00
parent 3d44d381bc
commit d73e5f8dc7
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
admin_domains.php
View File

@@ -351,7 +351,14 @@ if ($page == 'domains'
$admin = $userinfo;
}
$documentroot = $customer['documentroot'];
// set default path if admin/reseller has "change_serversettings == false" but we still
// need to respect the documentroot_use_default_value - setting
$path_suffix = '';
if (Settings::Get('system.documentroot_use_default_value') == 1) {
$path_suffix = '/'.$domain;
}
$documentroot = makeCorrectDir($customer['documentroot'] . $path_suffix);
$registration_date = trim($_POST['registration_date']);
$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', '0', ''));