- put customer standard-subdomains to the 20_* vhost configs (subdomains) so they are parsed before the main-domain, fixes #465

2010-11-08 07:41:51 +00:00
parent a638dddec9
commit 08e17f7d16
3 changed files with 46 additions and 0 deletions
--- a/scripts/jobs/cron_tasks.inc.http.10.apache.php
+++ b/scripts/jobs/cron_tasks.inc.http.10.apache.php
@@ -631,12 +631,14 @@ class apache
 	protected function getVhostFilename($domain, $ssl_vhost = false)
 	{
 		if((int)$domain['parentdomainid'] == 0 
+			&& isCustomerStdSubdomain((int)$domain['id']) == false
 			&& ((int)$domain['ismainbutsubto'] == 0
 			|| domainMainToSubExists($domain['ismainbutsubto']) == false)
 		) {
 			$vhost_no = '22';
 		}
 		elseif((int)$domain['parentdomainid'] == 0 
+			&& isCustomerStdSubdomain((int)$domain['id']) == false
 			&& (int)$domain['ismainbutsubto'] > 0
 		) {
 			$vhost_no = '21';