diff --git a/interface/web/sites/web_domain_edit.php b/interface/web/sites/web_domain_edit.php
index d74fae3ad9e89ae97126d17fd754360b504a1750..e5a012901fa66c523dd28c549e12b47c315ff3f2 100644
--- a/interface/web/sites/web_domain_edit.php
+++ b/interface/web/sites/web_domain_edit.php
@@ -242,6 +242,11 @@ class page_action extends tform_actions {
// The user is admin, so we fill in all IP addresses of the server
if($this->id > 0) {
+ if(!isset($this->dataRecord["server_id"])){
+ $tmp = $app->db->queryOneRecord("SELECT server_id FROM web_domain WHERE domain_id = ".intval($this->id));
+ $this->dataRecord["server_id"] = $tmp["server_id"];
+ unset($tmp);
+ }
$server_id = @$this->dataRecord["server_id"];
} else {
// Get the first server ID
diff --git a/server/conf/nginx_vhost.conf.master b/server/conf/nginx_vhost.conf.master
index 3ef9f00dbe0a324437c167b47435415935251f89..47b08deafc8c72cd97d7eb2de5b5492f72e305ea 100644
--- a/server/conf/nginx_vhost.conf.master
+++ b/server/conf/nginx_vhost.conf.master
@@ -25,7 +25,8 @@ server {
<tmpl_loop name="redirects">
if ($http_host ~* "<tmpl_var name='rewrite_domain'>$") {
- rewrite ^/(.+)$ <tmpl_var name='rewrite_target'>$1 <tmpl_var name='rewrite_type'>;
+ #rewrite ^/(.+)$ <tmpl_var name='rewrite_target'>$1 <tmpl_var name='rewrite_type'>;
+ rewrite ^<tmpl_var name='rewrite_exclude'>/(.+)$ <tmpl_var name='rewrite_target'>$2 <tmpl_var name='rewrite_type'>;
}
</tmpl_loop>
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
index ffd5ff7f2e6c4f2a209cb0ef9b531e1bc59a2f7d..0f3b0343b97d76272f53241872951cf42e9be0ef 100644
--- a/server/plugins-available/nginx_plugin.inc.php
+++ b/server/plugins-available/nginx_plugin.inc.php
@@ -794,6 +794,7 @@ class nginx_plugin {
if($data['new']['redirect_type'] != '') {
if(substr($data['new']['redirect_path'],-1) != '/') $data['new']['redirect_path'] .= '/';
if(substr($data['new']['redirect_path'],0,8) == '[scheme]') $data['new']['redirect_path'] = '$scheme'.substr($data['new']['redirect_path'],8);
+
/* Disabled path extension
if($data['new']['redirect_type'] == 'no' && substr($data['new']['redirect_path'],0,4) != 'http') {
$data['new']['redirect_path'] = $data['new']['document_root'].'/web'.realpath($data['new']['redirect_path']).'/';
@@ -802,22 +803,91 @@ class nginx_plugin {
switch($data['new']['subdomain']) {
case 'www':
+ if(substr($data['new']['redirect_path'],0,1) == '/'){ // relative path
+ $rewrite_exclude = '(?!'.substr($data['new']['redirect_path'],0,-1).')';
+ } else { // URL - check if URL is local
+ $tmp_redirect_path = $data['new']['redirect_path'];
+ if(substr($tmp_redirect_path,0,7) == '$scheme') $tmp_redirect_path = 'http'.substr($tmp_redirect_path,7);
+ $tmp_redirect_path_parts = parse_url($tmp_redirect_path);
+ if($tmp_redirect_path_parts['host'] == $data['new']['domain'] && ($tmp_redirect_path_parts['port'] == '80' || $tmp_redirect_path_parts['port'] == '443' || !isset($tmp_redirect_path_parts['port']))){
+ if(substr($tmp_redirect_path_parts['path'],-1) == '/') $tmp_redirect_path_parts['path'] = substr($tmp_redirect_path_parts['path'],0,-1);
+ if(substr($tmp_redirect_path_parts['path'],0,1) != '/') $tmp_redirect_path_parts['path'] = '/'.$tmp_redirect_path_parts['path'];
+ $rewrite_exclude = '(?!'.$tmp_redirect_path_parts['path'].')';
+ } else {
+ $rewrite_exclude = '(.?)';
+ }
+ unset($tmp_redirect_path);
+ unset($tmp_redirect_path_parts);
+ }
$rewrite_rules[] = array( 'rewrite_domain' => '^'.$data['new']['domain'],
'rewrite_type' => ($data['new']['redirect_type'] == 'no')?'':$data['new']['redirect_type'],
- 'rewrite_target' => $data['new']['redirect_path']);
+ 'rewrite_target' => $data['new']['redirect_path'],
+ 'rewrite_exclude' => $rewrite_exclude);
+
+ if(substr($data['new']['redirect_path'],0,1) == '/'){ // relative path
+ $rewrite_exclude = '(?!'.substr($data['new']['redirect_path'],0,-1).')';
+ } else { // URL - check if URL is local
+ $tmp_redirect_path = $data['new']['redirect_path'];
+ if(substr($tmp_redirect_path,0,7) == '$scheme') $tmp_redirect_path = 'http'.substr($tmp_redirect_path,7);
+ $tmp_redirect_path_parts = parse_url($tmp_redirect_path);
+ if($tmp_redirect_path_parts['host'] == 'www.'.$data['new']['domain'] && ($tmp_redirect_path_parts['port'] == '80' || $tmp_redirect_path_parts['port'] == '443' || !isset($tmp_redirect_path_parts['port']))){
+ if(substr($tmp_redirect_path_parts['path'],-1) == '/') $tmp_redirect_path_parts['path'] = substr($tmp_redirect_path_parts['path'],0,-1);
+ if(substr($tmp_redirect_path_parts['path'],0,1) != '/') $tmp_redirect_path_parts['path'] = '/'.$tmp_redirect_path_parts['path'];
+ $rewrite_exclude = '(?!'.$tmp_redirect_path_parts['path'].')';
+ } else {
+ $rewrite_exclude = '(.?)';
+ }
+ unset($tmp_redirect_path);
+ unset($tmp_redirect_path_parts);
+ }
$rewrite_rules[] = array( 'rewrite_domain' => '^www.'.$data['new']['domain'],
'rewrite_type' => ($data['new']['redirect_type'] == 'no')?'':$data['new']['redirect_type'],
- 'rewrite_target' => $data['new']['redirect_path']);
+ 'rewrite_target' => $data['new']['redirect_path'],
+ 'rewrite_exclude' => $rewrite_exclude);
break;
case '*':
+ if(substr($data['new']['redirect_path'],0,1) == '/'){ // relative path
+ $rewrite_exclude = '(?!'.substr($data['new']['redirect_path'],0,-1).')';
+ } else { // URL - check if URL is local
+ $tmp_redirect_path = $data['new']['redirect_path'];
+ if(substr($tmp_redirect_path,0,7) == '$scheme') $tmp_redirect_path = 'http'.substr($tmp_redirect_path,7);
+ $tmp_redirect_path_parts = parse_url($tmp_redirect_path);
+ if(substr($tmp_redirect_path_parts['host'],-strlen($data['new']['domain'])) == $data['new']['domain'] && ($tmp_redirect_path_parts['port'] == '80' || $tmp_redirect_path_parts['port'] == '443' || !isset($tmp_redirect_path_parts['port']))){
+ if(substr($tmp_redirect_path_parts['path'],-1) == '/') $tmp_redirect_path_parts['path'] = substr($tmp_redirect_path_parts['path'],0,-1);
+ if(substr($tmp_redirect_path_parts['path'],0,1) != '/') $tmp_redirect_path_parts['path'] = '/'.$tmp_redirect_path_parts['path'];
+ $rewrite_exclude = '(?!'.$tmp_redirect_path_parts['path'].')';
+ } else {
+ $rewrite_exclude = '(.?)';
+ }
+ unset($tmp_redirect_path);
+ unset($tmp_redirect_path_parts);
+ }
$rewrite_rules[] = array( 'rewrite_domain' => $data['new']['domain'],
'rewrite_type' => ($data['new']['redirect_type'] == 'no')?'':$data['new']['redirect_type'],
- 'rewrite_target' => $data['new']['redirect_path']);
+ 'rewrite_target' => $data['new']['redirect_path'],
+ 'rewrite_exclude' => $rewrite_exclude);
break;
default:
+ if(substr($data['new']['redirect_path'],0,1) == '/'){ // relative path
+ $rewrite_exclude = '(?!'.substr($data['new']['redirect_path'],0,-1).')';
+ } else { // URL - check if URL is local
+ $tmp_redirect_path = $data['new']['redirect_path'];
+ if(substr($tmp_redirect_path,0,7) == '$scheme') $tmp_redirect_path = 'http'.substr($tmp_redirect_path,7);
+ $tmp_redirect_path_parts = parse_url($tmp_redirect_path);
+ if($tmp_redirect_path_parts['host'] == $data['new']['domain'] && ($tmp_redirect_path_parts['port'] == '80' || $tmp_redirect_path_parts['port'] == '443' || !isset($tmp_redirect_path_parts['port']))){
+ if(substr($tmp_redirect_path_parts['path'],-1) == '/') $tmp_redirect_path_parts['path'] = substr($tmp_redirect_path_parts['path'],0,-1);
+ if(substr($tmp_redirect_path_parts['path'],0,1) != '/') $tmp_redirect_path_parts['path'] = '/'.$tmp_redirect_path_parts['path'];
+ $rewrite_exclude = '(?!'.$tmp_redirect_path_parts['path'].')';
+ } else {
+ $rewrite_exclude = '(.?)';
+ }
+ unset($tmp_redirect_path);
+ unset($tmp_redirect_path_parts);
+ }
$rewrite_rules[] = array( 'rewrite_domain' => '^'.$data['new']['domain'],
'rewrite_type' => ($data['new']['redirect_type'] == 'no')?'':$data['new']['redirect_type'],
- 'rewrite_target' => $data['new']['redirect_path']);
+ 'rewrite_target' => $data['new']['redirect_path'],
+ 'rewrite_exclude' => $rewrite_exclude);
}
}
@@ -826,30 +896,30 @@ class nginx_plugin {
$server_alias = array();
switch($data['new']['subdomain']) {
case 'www':
- $server_alias[] .= 'www.'.$data['new']['domain'].' ';
+ $server_alias[] = 'www.'.$data['new']['domain'].' ';
break;
case '*':
- $server_alias[] .= '*.'.$data['new']['domain'].' ';
+ $server_alias[] = '*.'.$data['new']['domain'].' ';
break;
}
if(is_array($aliases)) {
foreach($aliases as $alias) {
switch($alias['subdomain']) {
case 'www':
- $server_alias[] .= 'www.'.$alias['domain'].' '.$alias['domain'].' ';
+ $server_alias[] = 'www.'.$alias['domain'].' '.$alias['domain'].' ';
break;
case '*':
- $server_alias[] .= '*.'.$alias['domain'].' '.$alias['domain'].' ';
+ $server_alias[] = '*.'.$alias['domain'].' '.$alias['domain'].' ';
break;
default:
- $server_alias[] .= $alias['domain'].' ';
+ $server_alias[] = $alias['domain'].' ';
break;
}
$app->log('Add server alias: '.$alias['domain'],LOGLEVEL_DEBUG);
// Rewriting
if($alias['redirect_type'] != '') {
if(substr($alias['redirect_path'],-1) != '/') $alias['redirect_path'] .= '/';
- if(substr($alias['redirect_path'],0,8) == '[scheme]') $alias['redirect_path'] = '$scheme'.substr($alias['redirect_path'],8);
+ if(substr($alias['redirect_path'],0,8) == '[scheme]') $alias['redirect_path'] = '$scheme'.substr($alias['redirect_path'],8);
/* Disabled the path extension
if($data['new']['redirect_type'] == 'no' && substr($data['new']['redirect_path'],0,4) != 'http') {
@@ -859,22 +929,91 @@ class nginx_plugin {
switch($alias['subdomain']) {
case 'www':
+ if(substr($alias['redirect_path'],0,1) == '/'){ // relative path
+ $rewrite_exclude = '(?!'.substr($alias['redirect_path'],0,-1).')';
+ } else { // URL - check if URL is local
+ $tmp_redirect_path = $alias['redirect_path'];
+ if(substr($tmp_redirect_path,0,7) == '$scheme') $tmp_redirect_path = 'http'.substr($tmp_redirect_path,7);
+ $tmp_redirect_path_parts = parse_url($tmp_redirect_path);
+ if($tmp_redirect_path_parts['host'] == $alias['domain'] && ($tmp_redirect_path_parts['port'] == '80' || $tmp_redirect_path_parts['port'] == '443' || !isset($tmp_redirect_path_parts['port']))){
+ if(substr($tmp_redirect_path_parts['path'],-1) == '/') $tmp_redirect_path_parts['path'] = substr($tmp_redirect_path_parts['path'],0,-1);
+ if(substr($tmp_redirect_path_parts['path'],0,1) != '/') $tmp_redirect_path_parts['path'] = '/'.$tmp_redirect_path_parts['path'];
+ $rewrite_exclude = '(?!'.$tmp_redirect_path_parts['path'].')';
+ } else {
+ $rewrite_exclude = '(.?)';
+ }
+ unset($tmp_redirect_path);
+ unset($tmp_redirect_path_parts);
+ }
$rewrite_rules[] = array( 'rewrite_domain' => '^'.$alias['domain'],
'rewrite_type' => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type'],
- 'rewrite_target' => $alias['redirect_path']);
+ 'rewrite_target' => $alias['redirect_path'],
+ 'rewrite_exclude' => $rewrite_exclude);
+
+ if(substr($alias['redirect_path'],0,1) == '/'){ // relative path
+ $rewrite_exclude = '(?!'.substr($alias['redirect_path'],0,-1).')';
+ } else { // URL - check if URL is local
+ $tmp_redirect_path = $alias['redirect_path'];
+ if(substr($tmp_redirect_path,0,7) == '$scheme') $tmp_redirect_path = 'http'.substr($tmp_redirect_path,7);
+ $tmp_redirect_path_parts = parse_url($tmp_redirect_path);
+ if($tmp_redirect_path_parts['host'] == 'www.'.$alias['domain'] && ($tmp_redirect_path_parts['port'] == '80' || $tmp_redirect_path_parts['port'] == '443' || !isset($tmp_redirect_path_parts['port']))){
+ if(substr($tmp_redirect_path_parts['path'],-1) == '/') $tmp_redirect_path_parts['path'] = substr($tmp_redirect_path_parts['path'],0,-1);
+ if(substr($tmp_redirect_path_parts['path'],0,1) != '/') $tmp_redirect_path_parts['path'] = '/'.$tmp_redirect_path_parts['path'];
+ $rewrite_exclude = '(?!'.$tmp_redirect_path_parts['path'].')';
+ } else {
+ $rewrite_exclude = '(.?)';
+ }
+ unset($tmp_redirect_path);
+ unset($tmp_redirect_path_parts);
+ }
$rewrite_rules[] = array( 'rewrite_domain' => '^www.'.$alias['domain'],
'rewrite_type' => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type'],
- 'rewrite_target' => $alias['redirect_path']);
+ 'rewrite_target' => $alias['redirect_path'],
+ 'rewrite_exclude' => $rewrite_exclude);
break;
case '*':
+ if(substr($alias['redirect_path'],0,1) == '/'){ // relative path
+ $rewrite_exclude = '(?!'.substr($alias['redirect_path'],0,-1).')';
+ } else { // URL - check if URL is local
+ $tmp_redirect_path = $alias['redirect_path'];
+ if(substr($tmp_redirect_path,0,7) == '$scheme') $tmp_redirect_path = 'http'.substr($tmp_redirect_path,7);
+ $tmp_redirect_path_parts = parse_url($tmp_redirect_path);
+ if(substr($tmp_redirect_path_parts['host'],-strlen($alias['domain'])) == $alias['domain'] && ($tmp_redirect_path_parts['port'] == '80' || $tmp_redirect_path_parts['port'] == '443' || !isset($tmp_redirect_path_parts['port']))){
+ if(substr($tmp_redirect_path_parts['path'],-1) == '/') $tmp_redirect_path_parts['path'] = substr($tmp_redirect_path_parts['path'],0,-1);
+ if(substr($tmp_redirect_path_parts['path'],0,1) != '/') $tmp_redirect_path_parts['path'] = '/'.$tmp_redirect_path_parts['path'];
+ $rewrite_exclude = '(?!'.$tmp_redirect_path_parts['path'].')';
+ } else {
+ $rewrite_exclude = '(.?)';
+ }
+ unset($tmp_redirect_path);
+ unset($tmp_redirect_path_parts);
+ }
$rewrite_rules[] = array( 'rewrite_domain' => $alias['domain'],
'rewrite_type' => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type'],
- 'rewrite_target' => $alias['redirect_path']);
+ 'rewrite_target' => $alias['redirect_path'],
+ 'rewrite_exclude' => $rewrite_exclude);
break;
default:
+ if(substr($alias['redirect_path'],0,1) == '/'){ // relative path
+ $rewrite_exclude = '(?!'.substr($alias['redirect_path'],0,-1).')';
+ } else { // URL - check if URL is local
+ $tmp_redirect_path = $alias['redirect_path'];
+ if(substr($tmp_redirect_path,0,7) == '$scheme') $tmp_redirect_path = 'http'.substr($tmp_redirect_path,7);
+ $tmp_redirect_path_parts = parse_url($tmp_redirect_path);
+ if($tmp_redirect_path_parts['host'] == $alias['domain'] && ($tmp_redirect_path_parts['port'] == '80' || $tmp_redirect_path_parts['port'] == '443' || !isset($tmp_redirect_path_parts['port']))){
+ if(substr($tmp_redirect_path_parts['path'],-1) == '/') $tmp_redirect_path_parts['path'] = substr($tmp_redirect_path_parts['path'],0,-1);
+ if(substr($tmp_redirect_path_parts['path'],0,1) != '/') $tmp_redirect_path_parts['path'] = '/'.$tmp_redirect_path_parts['path'];
+ $rewrite_exclude = '(?!'.$tmp_redirect_path_parts['path'].')';
+ } else {
+ $rewrite_exclude = '(.?)';
+ }
+ unset($tmp_redirect_path);
+ unset($tmp_redirect_path_parts);
+ }
$rewrite_rules[] = array( 'rewrite_domain' => '^'.$alias['domain'],
'rewrite_type' => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type'],
- 'rewrite_target' => $alias['redirect_path']);
+ 'rewrite_target' => $alias['redirect_path'],
+ 'rewrite_exclude' => $rewrite_exclude);
}
}
}