Bugfix: previous bugfix was missing a thing

mcramer · mcramer · commit c7d735ffec78 · 2012-09-13T13:52:51.000Z
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
@@ -981,7 +981,7 @@ function update($event_name,$data) {
 								'rewrite_target_ssl' => $rewrite_target_ssl);
 							break;
 						default:
-                            if(substr($alias['domain'], 0, 2) === '*.') $domain_rule = '(^|\.)'.$this->_rewrite_quote($alias['domain']);
+                            if(substr($alias['domain'], 0, 2) === '*.') $domain_rule = '(^|\.)'.$this->_rewrite_quote(substr($alias['domain'], 2));
                             else $domain_rule = '^'.$this->_rewrite_quote($alias['domain']);
 							$rewrite_rules[] = array(	'rewrite_domain' 	=> $domain_rule,
 								'rewrite_type' 		=> ($alias['redirect_type'] == 'no')?'':'['.$alias['redirect_type'].']',
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
@@ -1172,7 +1172,7 @@ function update($event_name,$data) {
 								unset($tmp_redirect_path);
 								unset($tmp_redirect_path_parts);
 							}
-                            if(substr($alias['domain'], 0, 2) === '*.') $domain_rule = '(^|\.)'.$this->_rewrite_quote($alias['domain']);
+                            if(substr($alias['domain'], 0, 2) === '*.') $domain_rule = '(^|\.)'.$this->_rewrite_quote(substr($alias['domain'], 2));
                             else $domain_rule = '^'.$this->_rewrite_quote($alias['domain']);
 							$rewrite_rules[] = array(	'rewrite_domain' 	=> $domain_rule,
 							'rewrite_type' 		=> ($alias['redirect_type'] == 'no')?'':$alias['redirect_type'],

Original file line number	Diff line number	Diff line change
`@@ -1172,7 +1172,7 @@ function update($event_name,$data) {`
`1172`	`1172`	`unset($tmp_redirect_path);`
`1173`	`1173`	`unset($tmp_redirect_path_parts);`
`1174`	`1174`	`}`
`1175`		`- if(substr($alias['domain'], 0, 2) === '*.') $domain_rule = '(^\|\.)'.$this->_rewrite_quote($alias['domain']);`
	`1175`	`+ if(substr($alias['domain'], 0, 2) === '*.') $domain_rule = '(^\|\.)'.$this->_rewrite_quote(substr($alias['domain'], 2));`
`1176`	`1176`	`else $domain_rule = '^'.$this->_rewrite_quote($alias['domain']);`
`1177`	`1177`	`$rewrite_rules[] = array( 'rewrite_domain' => $domain_rule,`
`1178`	`1178`	`'rewrite_type' => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type'],`