From f26825f736be267c68709efc5d359a7ba7858ade Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Thu, 08 Nov 2012 12:36:55 -0500
Subject: [PATCH] - Added SEO Redirects to alias domains.
---
server/plugins-available/nginx_plugin.inc.php | 290 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 282 insertions(+), 8 deletions(-)
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
index 365ea3b..e5920ad 100644
--- a/server/plugins-available/nginx_plugin.inc.php
+++ b/server/plugins-available/nginx_plugin.inc.php
@@ -920,15 +920,42 @@
}
// Set SEO Redirect
- if($data['new']['seo_redirect'] != '' && ($data['new']['subdomain'] == 'www' || $data['new']['subdomain'] == '*')){
+ if($data['new']['seo_redirect'] != ''){
$vhost_data['seo_redirect_enabled'] = 1;
- if($data['new']['seo_redirect'] == 'non_www_to_www'){
- $vhost_data['seo_redirect_origin_domain'] = $data['new']['domain'];
- $vhost_data['seo_redirect_target_domain'] = 'www.'.$data['new']['domain'];
+ if($data['new']['subdomain'] == 'www' || $data['new']['subdomain'] == '*'){
+ if($data['new']['seo_redirect'] == 'non_www_to_www'){
+ $vhost_data['seo_redirect_origin_domain'] = $data['new']['domain'];
+ $vhost_data['seo_redirect_target_domain'] = 'www.'.$data['new']['domain'];
+ $vhost_data['seo_redirect_operator'] = '=';
+ }
+ if($data['new']['seo_redirect'] == '*_domain_tld_to_www_domain_tld'){
+ // ^(example\.com|(?!\bwww\b)\.example\.com)$
+ // ^(example\.com|((?:\w+(?:-\w+)*\.)*)((?!www\.)\w+(?:-\w+)*)(\.example\.com))$
+ $vhost_data['seo_redirect_origin_domain'] = '^('.str_replace('.', '\.', $data['new']['domain']).'|((?:\w+(?:-\w+)*\.)*)((?!www\.)\w+(?:-\w+)*)(\.'.str_replace('.', '\.', $data['new']['domain']).'))$';
+ $vhost_data['seo_redirect_target_domain'] = 'www.'.$data['new']['domain'];
+ $vhost_data['seo_redirect_operator'] = '~*';
+ }
+ if($data['new']['seo_redirect'] == '*_to_www_domain_tld'){
+ $vhost_data['seo_redirect_origin_domain'] = 'www.'.$data['new']['domain'];
+ $vhost_data['seo_redirect_target_domain'] = $vhost_data['seo_redirect_origin_domain'];
+ $vhost_data['seo_redirect_operator'] = '!=';
+ }
}
if($data['new']['seo_redirect'] == 'www_to_non_www'){
$vhost_data['seo_redirect_origin_domain'] = 'www.'.$data['new']['domain'];
$vhost_data['seo_redirect_target_domain'] = $data['new']['domain'];
+ $vhost_data['seo_redirect_operator'] = '=';
+ }
+ if($data['new']['seo_redirect'] == '*_domain_tld_to_domain_tld'){
+ // ^(.+)\.example\.com$
+ $vhost_data['seo_redirect_origin_domain'] = '^(.+)\.'.str_replace('.', '\.', $data['new']['domain']).'$';
+ $vhost_data['seo_redirect_target_domain'] = $data['new']['domain'];
+ $vhost_data['seo_redirect_operator'] = '~*';
+ }
+ if($data['new']['seo_redirect'] == '*_to_domain_tld'){
+ $vhost_data['seo_redirect_origin_domain'] = $data['new']['domain'];
+ $vhost_data['seo_redirect_target_domain'] = $vhost_data['seo_redirect_origin_domain'];
+ $vhost_data['seo_redirect_operator'] = '!=';
}
} else {
$vhost_data['seo_redirect_enabled'] = 0;
@@ -947,6 +974,23 @@
} else {
$data['new']['redirect_path'] = 'http'.substr($data['new']['redirect_path'],8);
}
+ }
+
+ // Custom proxy directives
+ if($data['new']['redirect_type'] == 'proxy' && trim($data['new']['proxy_directives'] != '')){
+ $final_proxy_directives = array();
+ $proxy_directives = $data['new']['proxy_directives'];
+ // Make sure we only have Unix linebreaks
+ $proxy_directives = str_replace("\r\n", "\n", $proxy_directives);
+ $proxy_directives = str_replace("\r", "\n", $proxy_directives);
+ $proxy_directive_lines = explode("\n", $proxy_directives);
+ if(is_array($proxy_directive_lines) && !empty($proxy_directive_lines)){
+ foreach($proxy_directive_lines as $proxy_directive_line){
+ $final_proxy_directives[] = array('proxy_directive' => $proxy_directive_line);
+ }
+ }
+ } else {
+ $final_proxy_directives = false;
}
switch($data['new']['subdomain']) {
@@ -992,6 +1036,7 @@
'rewrite_target' => $data['new']['redirect_path'],
'rewrite_exclude' => $rewrite_exclude,
'rewrite_subdir' => $rewrite_subdir,
+ 'proxy_directives' => $final_proxy_directives,
'use_rewrite' => ($data['new']['redirect_type'] == 'proxy' ? false:true),
'use_proxy' => ($data['new']['redirect_type'] == 'proxy' ? true:false));
break;
@@ -1039,6 +1084,7 @@
'rewrite_target' => $data['new']['redirect_path'],
'rewrite_exclude' => $rewrite_exclude,
'rewrite_subdir' => $rewrite_subdir,
+ 'proxy_directives' => $final_proxy_directives,
'use_rewrite' => ($data['new']['redirect_type'] == 'proxy' ? false:true),
'use_proxy' => ($data['new']['redirect_type'] == 'proxy' ? true:false));
break;
@@ -1084,6 +1130,7 @@
'rewrite_target' => $data['new']['redirect_path'],
'rewrite_exclude' => $rewrite_exclude,
'rewrite_subdir' => $rewrite_subdir,
+ 'proxy_directives' => $final_proxy_directives,
'use_rewrite' => ($data['new']['redirect_type'] == 'proxy' ? false:true),
'use_proxy' => ($data['new']['redirect_type'] == 'proxy' ? true:false));
}
@@ -1118,8 +1165,27 @@
// get alias domains (co-domains and subdomains)
$aliases = $app->db->queryAllRecords('SELECT * FROM web_domain WHERE parent_domain_id = '.$data['new']['domain_id']." AND active = 'y' AND type != 'vhostsubdomain'");
+ $alias_seo_redirects = array();
if(is_array($aliases)) {
foreach($aliases as $alias) {
+
+ // Custom proxy directives
+ if($alias['redirect_type'] == 'proxy' && trim($alias['proxy_directives'] != '')){
+ $final_proxy_directives = array();
+ $proxy_directives = $alias['proxy_directives'];
+ // Make sure we only have Unix linebreaks
+ $proxy_directives = str_replace("\r\n", "\n", $proxy_directives);
+ $proxy_directives = str_replace("\r", "\n", $proxy_directives);
+ $proxy_directive_lines = explode("\n", $proxy_directives);
+ if(is_array($proxy_directive_lines) && !empty($proxy_directive_lines)){
+ foreach($proxy_directive_lines as $proxy_directive_line){
+ $final_proxy_directives[] = array('proxy_directive' => $proxy_directive_line);
+ }
+ }
+ } else {
+ $final_proxy_directives = false;
+ }
+
if($alias['redirect_type'] == '' || $alias['redirect_path'] == '') {
switch($alias['subdomain']) {
case 'www':
@@ -1133,7 +1199,47 @@
break;
}
$app->log('Add server alias: '.$alias['domain'],LOGLEVEL_DEBUG);
+
+ // Add SEO redirects for alias domains
+ if($alias['seo_redirect'] != ''){
+ if($alias['subdomain'] == 'www' || $alias['subdomain'] == '*'){
+ if($alias['seo_redirect'] == 'non_www_to_www'){
+ $alias_seo_redirects[] = array( 'alias_seo_redirect_origin_domain' => $alias['domain'],
+ 'alias_seo_redirect_target_domain' => 'www.'.$alias['domain'],
+ 'alias_seo_redirect_operator' => '=');
+ }
+ if($alias['seo_redirect'] == '*_domain_tld_to_www_domain_tld'){
+ // ^(example\.com|(?!\bwww\b)\.example\.com)$
+ // ^(example\.com|((?:\w+(?:-\w+)*\.)*)((?!www\.)\w+(?:-\w+)*)(\.example\.com))$
+ $alias_seo_redirects[] = array( 'alias_seo_redirect_origin_domain' => '^('.str_replace('.', '\.', $alias['domain']).'|((?:\w+(?:-\w+)*\.)*)((?!www\.)\w+(?:-\w+)*)(\.'.str_replace('.', '\.', $alias['domain']).'))$',
+ 'alias_seo_redirect_target_domain' => 'www.'.$alias['domain'],
+ 'alias_seo_redirect_operator' => '~*');
+ }
+ if($alias['seo_redirect'] == '*_to_www_domain_tld'){
+ $alias_seo_redirects[] = array( 'alias_seo_redirect_origin_domain' => 'www.'.$alias['domain'],
+ 'alias_seo_redirect_target_domain' => 'www.'.$alias['domain'],
+ 'alias_seo_redirect_operator' => '!=');
+ }
+ }
+ if($alias['seo_redirect'] == 'www_to_non_www'){
+ $alias_seo_redirects[] = array( 'alias_seo_redirect_origin_domain' => 'www.'.$alias['domain'],
+ 'alias_seo_redirect_target_domain' => $alias['domain'],
+ 'alias_seo_redirect_operator' => '=');
+ }
+ if($alias['seo_redirect'] == '*_domain_tld_to_domain_tld'){
+ // ^(.+)\.example\.com$
+ $alias_seo_redirects[] = array( 'alias_seo_redirect_origin_domain' => '^(.+)\.'.str_replace('.', '\.', $alias['domain']).'$',
+ 'alias_seo_redirect_target_domain' => $alias['domain'],
+ 'alias_seo_redirect_operator' => '~*');
+ }
+ if($alias['seo_redirect'] == '*_to_domain_tld'){
+ $alias_seo_redirects[] = array( 'alias_seo_redirect_origin_domain' => $alias['domain'],
+ 'alias_seo_redirect_target_domain' => $alias['domain'],
+ 'alias_seo_redirect_operator' => '!=');
+ }
+ }
}
+
// Rewriting
if($alias['redirect_type'] != '' && $alias['redirect_path'] != '') {
if(substr($alias['redirect_path'],-1) != '/') $alias['redirect_path'] .= '/';
@@ -1165,12 +1271,54 @@
if($alias['redirect_type'] != 'proxy'){
if(substr($alias['redirect_path'],-1) == '/') $alias['redirect_path'] = substr($alias['redirect_path'],0,-1);
}
+ // Add SEO redirects for alias domains
+ $alias_seo_redirects2 = array();
+ if($alias['seo_redirect'] != ''){
+ if($alias['subdomain'] == 'www' || $alias['subdomain'] == '*'){
+ if($alias['seo_redirect'] == 'non_www_to_www'){
+ $alias_seo_redirects2[] = array( 'alias_seo_redirect_origin_domain' => $alias['domain'],
+ 'alias_seo_redirect_target_domain' => 'www.'.$alias['domain'],
+ 'alias_seo_redirect_operator' => '=');
+ }
+ if($alias['seo_redirect'] == '*_domain_tld_to_www_domain_tld'){
+ // ^(example\.com|(?!\bwww\b)\.example\.com)$
+ // ^(example\.com|((?:\w+(?:-\w+)*\.)*)((?!www\.)\w+(?:-\w+)*)(\.example\.com))$
+ $alias_seo_redirects2[] = array( 'alias_seo_redirect_origin_domain' => '^('.str_replace('.', '\.', $alias['domain']).'|((?:\w+(?:-\w+)*\.)*)((?!www\.)\w+(?:-\w+)*)(\.'.str_replace('.', '\.', $alias['domain']).'))$',
+ 'alias_seo_redirect_target_domain' => 'www.'.$alias['domain'],
+ 'alias_seo_redirect_operator' => '~*');
+ }
+ if($alias['seo_redirect'] == '*_to_www_domain_tld'){
+ $alias_seo_redirects2[] = array( 'alias_seo_redirect_origin_domain' => 'www.'.$alias['domain'],
+ 'alias_seo_redirect_target_domain' => 'www.'.$alias['domain'],
+ 'alias_seo_redirect_operator' => '!=');
+ }
+ }
+ if($alias['seo_redirect'] == 'www_to_non_www'){
+ $alias_seo_redirects2[] = array( 'alias_seo_redirect_origin_domain' => 'www.'.$alias['domain'],
+ 'alias_seo_redirect_target_domain' => $alias['domain'],
+ 'alias_seo_redirect_operator' => '=');
+ }
+ if($alias['seo_redirect'] == '*_domain_tld_to_domain_tld'){
+ // ^(.+)\.example\.com$
+ $alias_seo_redirects2[] = array( 'alias_seo_redirect_origin_domain' => '^(.+)\.'.str_replace('.', '\.', $alias['domain']).'$',
+ 'alias_seo_redirect_target_domain' => $alias['domain'],
+ 'alias_seo_redirect_operator' => '~*');
+ }
+ if($alias['seo_redirect'] == '*_to_domain_tld'){
+ $alias_seo_redirects2[] = array( 'alias_seo_redirect_origin_domain' => $alias['domain'],
+ 'alias_seo_redirect_target_domain' => $alias['domain'],
+ 'alias_seo_redirect_operator' => '!=');
+ }
+ }
$rewrite_rules[] = array( 'rewrite_domain' => $alias['domain'],
'rewrite_type' => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type'],
'rewrite_target' => $alias['redirect_path'],
'rewrite_subdir' => $rewrite_subdir,
+ 'proxy_directives' => $final_proxy_directives,
'use_rewrite' => ($alias['redirect_type'] == 'proxy' ? false:true),
- 'use_proxy' => ($alias['redirect_type'] == 'proxy' ? true:false));
+ 'use_proxy' => ($alias['redirect_type'] == 'proxy' ? true:false),
+ 'alias_seo_redirects2' => (count($alias_seo_redirects2) > 0 ? $alias_seo_redirects2 : false));
+
if(substr($alias['redirect_path'],0,1) == '/'){ // relative path
if($alias['redirect_type'] == 'proxy'){
@@ -1190,12 +1338,53 @@
if($alias['redirect_type'] != 'proxy'){
if(substr($alias['redirect_path'],-1) == '/') $alias['redirect_path'] = substr($alias['redirect_path'],0,-1);
}
+ // Add SEO redirects for alias domains
+ $alias_seo_redirects2 = array();
+ if($alias['seo_redirect'] != ''){
+ if($alias['subdomain'] == 'www' || $alias['subdomain'] == '*'){
+ if($alias['seo_redirect'] == 'non_www_to_www'){
+ $alias_seo_redirects2[] = array( 'alias_seo_redirect_origin_domain' => $alias['domain'],
+ 'alias_seo_redirect_target_domain' => 'www.'.$alias['domain'],
+ 'alias_seo_redirect_operator' => '=');
+ }
+ if($alias['seo_redirect'] == '*_domain_tld_to_www_domain_tld'){
+ // ^(example\.com|(?!\bwww\b)\.example\.com)$
+ // ^(example\.com|((?:\w+(?:-\w+)*\.)*)((?!www\.)\w+(?:-\w+)*)(\.example\.com))$
+ $alias_seo_redirects2[] = array( 'alias_seo_redirect_origin_domain' => '^('.str_replace('.', '\.', $alias['domain']).'|((?:\w+(?:-\w+)*\.)*)((?!www\.)\w+(?:-\w+)*)(\.'.str_replace('.', '\.', $alias['domain']).'))$',
+ 'alias_seo_redirect_target_domain' => 'www.'.$alias['domain'],
+ 'alias_seo_redirect_operator' => '~*');
+ }
+ if($alias['seo_redirect'] == '*_to_www_domain_tld'){
+ $alias_seo_redirects2[] = array( 'alias_seo_redirect_origin_domain' => 'www.'.$alias['domain'],
+ 'alias_seo_redirect_target_domain' => 'www.'.$alias['domain'],
+ 'alias_seo_redirect_operator' => '!=');
+ }
+ }
+ if($alias['seo_redirect'] == 'www_to_non_www'){
+ $alias_seo_redirects2[] = array( 'alias_seo_redirect_origin_domain' => 'www.'.$alias['domain'],
+ 'alias_seo_redirect_target_domain' => $alias['domain'],
+ 'alias_seo_redirect_operator' => '=');
+ }
+ if($alias['seo_redirect'] == '*_domain_tld_to_domain_tld'){
+ // ^(.+)\.example\.com$
+ $alias_seo_redirects2[] = array( 'alias_seo_redirect_origin_domain' => '^(.+)\.'.str_replace('.', '\.', $alias['domain']).'$',
+ 'alias_seo_redirect_target_domain' => $alias['domain'],
+ 'alias_seo_redirect_operator' => '~*');
+ }
+ if($alias['seo_redirect'] == '*_to_domain_tld'){
+ $alias_seo_redirects2[] = array( 'alias_seo_redirect_origin_domain' => $alias['domain'],
+ 'alias_seo_redirect_target_domain' => $alias['domain'],
+ 'alias_seo_redirect_operator' => '!=');
+ }
+ }
$rewrite_rules[] = array( 'rewrite_domain' => 'www.'.$alias['domain'],
'rewrite_type' => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type'],
'rewrite_target' => $alias['redirect_path'],
'rewrite_subdir' => $rewrite_subdir,
+ 'proxy_directives' => $final_proxy_directives,
'use_rewrite' => ($alias['redirect_type'] == 'proxy' ? false:true),
- 'use_proxy' => ($alias['redirect_type'] == 'proxy' ? true:false));
+ 'use_proxy' => ($alias['redirect_type'] == 'proxy' ? true:false),
+ 'alias_seo_redirects2' => (count($alias_seo_redirects2) > 0 ? $alias_seo_redirects2 : false));
break;
case '*':
if(substr($alias['redirect_path'],0,1) == '/'){ // relative path
@@ -1216,12 +1405,53 @@
if($alias['redirect_type'] != 'proxy'){
if(substr($alias['redirect_path'],-1) == '/') $alias['redirect_path'] = substr($alias['redirect_path'],0,-1);
}
+ // Add SEO redirects for alias domains
+ $alias_seo_redirects2 = array();
+ if($alias['seo_redirect'] != ''){
+ if($alias['subdomain'] == 'www' || $alias['subdomain'] == '*'){
+ if($alias['seo_redirect'] == 'non_www_to_www'){
+ $alias_seo_redirects2[] = array( 'alias_seo_redirect_origin_domain' => $alias['domain'],
+ 'alias_seo_redirect_target_domain' => 'www.'.$alias['domain'],
+ 'alias_seo_redirect_operator' => '=');
+ }
+ if($alias['seo_redirect'] == '*_domain_tld_to_www_domain_tld'){
+ // ^(example\.com|(?!\bwww\b)\.example\.com)$
+ // ^(example\.com|((?:\w+(?:-\w+)*\.)*)((?!www\.)\w+(?:-\w+)*)(\.example\.com))$
+ $alias_seo_redirects2[] = array( 'alias_seo_redirect_origin_domain' => '^('.str_replace('.', '\.', $alias['domain']).'|((?:\w+(?:-\w+)*\.)*)((?!www\.)\w+(?:-\w+)*)(\.'.str_replace('.', '\.', $alias['domain']).'))$',
+ 'alias_seo_redirect_target_domain' => 'www.'.$alias['domain'],
+ 'alias_seo_redirect_operator' => '~*');
+ }
+ if($alias['seo_redirect'] == '*_to_www_domain_tld'){
+ $alias_seo_redirects2[] = array( 'alias_seo_redirect_origin_domain' => 'www.'.$alias['domain'],
+ 'alias_seo_redirect_target_domain' => 'www.'.$alias['domain'],
+ 'alias_seo_redirect_operator' => '!=');
+ }
+ }
+ if($alias['seo_redirect'] == 'www_to_non_www'){
+ $alias_seo_redirects2[] = array( 'alias_seo_redirect_origin_domain' => 'www.'.$alias['domain'],
+ 'alias_seo_redirect_target_domain' => $alias['domain'],
+ 'alias_seo_redirect_operator' => '=');
+ }
+ if($alias['seo_redirect'] == '*_domain_tld_to_domain_tld'){
+ // ^(.+)\.example\.com$
+ $alias_seo_redirects2[] = array( 'alias_seo_redirect_origin_domain' => '^(.+)\.'.str_replace('.', '\.', $alias['domain']).'$',
+ 'alias_seo_redirect_target_domain' => $alias['domain'],
+ 'alias_seo_redirect_operator' => '~*');
+ }
+ if($alias['seo_redirect'] == '*_to_domain_tld'){
+ $alias_seo_redirects2[] = array( 'alias_seo_redirect_origin_domain' => $alias['domain'],
+ 'alias_seo_redirect_target_domain' => $alias['domain'],
+ 'alias_seo_redirect_operator' => '!=');
+ }
+ }
$rewrite_rules[] = array( 'rewrite_domain' => '*.' . $alias['domain'],
'rewrite_type' => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type'],
'rewrite_target' => $alias['redirect_path'],
'rewrite_subdir' => $rewrite_subdir,
+ 'proxy_directives' => $final_proxy_directives,
'use_rewrite' => ($alias['redirect_type'] == 'proxy' ? false:true),
- 'use_proxy' => ($alias['redirect_type'] == 'proxy' ? true:false));
+ 'use_proxy' => ($alias['redirect_type'] == 'proxy' ? true:false),
+ 'alias_seo_redirects2' => (count($alias_seo_redirects2) > 0 ? $alias_seo_redirects2 : false));
break;
default:
if(substr($alias['redirect_path'],0,1) == '/'){ // relative path
@@ -1244,12 +1474,53 @@
}
if(substr($alias['domain'], 0, 2) === '*.') $domain_rule = '*.'.substr($alias['domain'], 2);
else $domain_rule = $alias['domain'];
+ // Add SEO redirects for alias domains
+ $alias_seo_redirects2 = array();
+ if($alias['seo_redirect'] != ''){
+ if($alias['subdomain'] == 'www' || $alias['subdomain'] == '*'){
+ if($alias['seo_redirect'] == 'non_www_to_www'){
+ $alias_seo_redirects2[] = array( 'alias_seo_redirect_origin_domain' => $alias['domain'],
+ 'alias_seo_redirect_target_domain' => 'www.'.$alias['domain'],
+ 'alias_seo_redirect_operator' => '=');
+ }
+ if($alias['seo_redirect'] == '*_domain_tld_to_www_domain_tld'){
+ // ^(example\.com|(?!\bwww\b)\.example\.com)$
+ // ^(example\.com|((?:\w+(?:-\w+)*\.)*)((?!www\.)\w+(?:-\w+)*)(\.example\.com))$
+ $alias_seo_redirects2[] = array( 'alias_seo_redirect_origin_domain' => '^('.str_replace('.', '\.', $alias['domain']).'|((?:\w+(?:-\w+)*\.)*)((?!www\.)\w+(?:-\w+)*)(\.'.str_replace('.', '\.', $alias['domain']).'))$',
+ 'alias_seo_redirect_target_domain' => 'www.'.$alias['domain'],
+ 'alias_seo_redirect_operator' => '~*');
+ }
+ if($alias['seo_redirect'] == '*_to_www_domain_tld'){
+ $alias_seo_redirects2[] = array( 'alias_seo_redirect_origin_domain' => 'www.'.$alias['domain'],
+ 'alias_seo_redirect_target_domain' => 'www.'.$alias['domain'],
+ 'alias_seo_redirect_operator' => '!=');
+ }
+ }
+ if($alias['seo_redirect'] == 'www_to_non_www'){
+ $alias_seo_redirects2[] = array( 'alias_seo_redirect_origin_domain' => 'www.'.$alias['domain'],
+ 'alias_seo_redirect_target_domain' => $alias['domain'],
+ 'alias_seo_redirect_operator' => '=');
+ }
+ if($alias['seo_redirect'] == '*_domain_tld_to_domain_tld'){
+ // ^(.+)\.example\.com$
+ $alias_seo_redirects2[] = array( 'alias_seo_redirect_origin_domain' => '^(.+)\.'.str_replace('.', '\.', $alias['domain']).'$',
+ 'alias_seo_redirect_target_domain' => $alias['domain'],
+ 'alias_seo_redirect_operator' => '~*');
+ }
+ if($alias['seo_redirect'] == '*_to_domain_tld'){
+ $alias_seo_redirects2[] = array( 'alias_seo_redirect_origin_domain' => $alias['domain'],
+ 'alias_seo_redirect_target_domain' => $alias['domain'],
+ 'alias_seo_redirect_operator' => '!=');
+ }
+ }
$rewrite_rules[] = array( 'rewrite_domain' => $domain_rule,
'rewrite_type' => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type'],
'rewrite_target' => $alias['redirect_path'],
'rewrite_subdir' => $rewrite_subdir,
+ 'proxy_directives' => $final_proxy_directives,
'use_rewrite' => ($alias['redirect_type'] == 'proxy' ? false:true),
- 'use_proxy' => ($alias['redirect_type'] == 'proxy' ? true:false));
+ 'use_proxy' => ($alias['redirect_type'] == 'proxy' ? true:false),
+ 'alias_seo_redirects2' => (count($alias_seo_redirects2) > 0 ? $alias_seo_redirects2 : false));
}
}
}
@@ -1276,6 +1547,9 @@
if(count($own_rewrite_rules) > 0) {
$tpl->setLoop('own_redirects',$own_rewrite_rules);
}
+ if(count($alias_seo_redirects) > 0) {
+ $tpl->setLoop('alias_seo_redirects',$alias_seo_redirects);
+ }
//* Create basic http auth for website statistics
$tpl->setVar('stats_auth_passwd_file', $data['new']['document_root']."/web/stats/.htpasswd_stats");
--
Gitblit v1.9.1