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

Change redirect host from main domain name to requested domain name

Browse Source
This commit is contained in:
Janos Muzsi
2016-11-24 22:55:57 +01:00
parent 54200427ab
commit 2c00f982d8
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/jobs/cron_tasks.inc.http.10.apache.php
View File

@@ -808,7 +808,7 @@ class apache extends HttpConfigBase
$_sslport = ":" . $ssldestport['port']; $_sslport = ":" . $ssldestport['port'];
} }
$domain['documentroot'] = 'https://' . $domain['domain'] . $_sslport . '/'; $domain['documentroot'] = 'https://%{HTTP_HOST}' . $_sslport . '/';
} }
if ($ssl_vhost === true && $domain['ssl'] == '1' && Settings::Get('system.use_ssl') == '1') { if ($ssl_vhost === true && $domain['ssl'] == '1' && Settings::Get('system.use_ssl') == '1') {

14
scripts/jobs/cron_tasks.inc.http.20.lighttpd.php
View File

@@ -424,7 +424,7 @@ class lighttpd extends HttpConfigBase
$_sslport = ":" . $ssldestport['port']; $_sslport = ":" . $ssldestport['port'];
} }
$domain['documentroot'] = 'https://' . $domain['domain'] . $_sslport . '/'; $domain['documentroot'] = 'https://%1' . $_sslport . '/';
} }
// avoid using any whitespaces // avoid using any whitespaces
@@ -435,11 +435,13 @@ class lighttpd extends HttpConfigBase
// Get domain's redirect code // Get domain's redirect code
$code = getDomainRedirectCode($domain['id'], '301'); $code = getDomainRedirectCode($domain['id'], '301');
$vhost_content .= ' url.redirect-code = ' . $code. "\n"; $vhost_content .= ' $HTTP["host"] =~ "^(.*)$" {'. "\n";
$vhost_content .= ' url.redirect = (' . "\n"; $vhost_content .= ' url.redirect-code = ' . $code. "\n";
$vhost_content .= ' "^/(.*)$" => "' . $uri . '$1"' . "\n"; $vhost_content .= ' url.redirect = (' . "\n";
$vhost_content .= ' )' . "\n"; $vhost_content .= ' "^/(.*)$" => "' . $uri . '$1"' . "\n";
$vhost_content .= ' )' . "\n";
$vhost_content .= ' }' . "\n";
} else { } else {
mkDirWithCorrectOwnership($domain['customerroot'], $domain['documentroot'], $domain['guid'], $domain['guid'], true, true); mkDirWithCorrectOwnership($domain['customerroot'], $domain['documentroot'], $domain['guid'], $domain['guid'], true, true);

2
scripts/jobs/cron_tasks.inc.http.30.nginx.php
View File

@@ -447,7 +447,7 @@ class nginx extends HttpConfigBase
$_sslport = ":" . $ssldestport['port']; $_sslport = ":" . $ssldestport['port'];
} }
$domain['documentroot'] = 'https://' . $domain['domain'] . $_sslport . '/'; $domain['documentroot'] = 'https://$host' . $_sslport . '/';
} }
// avoid using any whitespaces // avoid using any whitespaces