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

don't prepend a slash to the domains 'path' value if it's a hostname, fixes #657

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2011-03-14 07:58:32 +01:00
parent 07d82fb063
commit 2f0a717241
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
customer_domains.php
View File

@@ -541,10 +541,17 @@ elseif($page == 'domains')
if(preg_match('/^https?\:\/\//', $result['documentroot'])
&& validateUrl($idna_convert->encode($result['documentroot']))
&& $settings['panel']['pathedit'] == 'Dropdown')
{
$urlvalue = $result['documentroot'];
$pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], $settings['panel']['pathedit']);
) {
if($settings['panel']['pathedit'] == 'Dropdown')
{
$urlvalue = $result['documentroot'];
$pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], $settings['panel']['pathedit']);
}
else
{
$urlvalue = '';
$pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], $settings['panel']['pathedit'], $result['documentroot'], true);
}
}
else
{