- added switch if specialsettings are to be set for all subdomains or not

- fixed old syscp-bug #1266, lighttpd has an internal lmit of regex-hits, see http://redmine.lighttpd.net/issues/2059
- removing billing-code in domains/domains_domain.tpl
This commit is contained in:
Michael Kaufmann (d00p)
2010-01-29 09:30:55 +00:00
parent 6014cf7598
commit dea3c4ec62
7 changed files with 31 additions and 9 deletions

View File

@@ -407,13 +407,13 @@ class lighttpd
if($domain['iswildcarddomain'] == '1')
{
$server_string[] = '(^|\.)' . $domain_name . '$';
$server_string[] = '(?:^|\.)' . $domain_name . '$';
}
else
{
if($domain['wwwserveralias'] == '1')
{
$server_string[] = '^(www\.|)' . $domain_name . '$';
$server_string[] = '^(?:www\.|)' . $domain_name . '$';
}
else
{
@@ -429,13 +429,13 @@ class lighttpd
if($alias_domain['iswildcarddomain'] == '1')
{
$server_string[] = '(^|\.)' . $alias_domain_name . '$';
$server_string[] = '(?:^|\.)' . $alias_domain_name . '$';
}
else
{
if($alias_domain['wwwserveralias'] == '1')
{
$server_string[] = '^(www\.|)' . $alias_domain_name . '$';
$server_string[] = '^(?:www\.|)' . $alias_domain_name . '$';
}
else
{