From 4f1de1c95e0a6c0a9da8f9865b960386ca040d4f Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Mon, 12 Nov 2012 11:29:10 -0500
Subject: [PATCH] - Make sure alias domain SEO redirects get written only if they don't collide with SEO redirects from parent web site.
---
server/plugins-available/apache2_plugin.inc.php | 2 +-
server/plugins-available/nginx_plugin.inc.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 5244341..1b9bd53 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -954,7 +954,7 @@
$app->log('Add server alias: '.$alias['domain'],LOGLEVEL_DEBUG);
// Add SEO redirects for alias domains
- if($alias['seo_redirect'] != ''){
+ if($alias['seo_redirect'] != '' && $data['new']['seo_redirect'] != '*_to_www_domain_tld' && $data['new']['seo_redirect'] != '*_to_domain_tld'){
$tmp_seo_redirects = $this->get_seo_redirects($alias, 'alias_');
if(is_array($tmp_seo_redirects) && !empty($tmp_seo_redirects)){
$alias_seo_redirects[] = $tmp_seo_redirects;
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
index d333954..9be5594 100644
--- a/server/plugins-available/nginx_plugin.inc.php
+++ b/server/plugins-available/nginx_plugin.inc.php
@@ -1174,7 +1174,7 @@
$app->log('Add server alias: '.$alias['domain'],LOGLEVEL_DEBUG);
// Add SEO redirects for alias domains
- if($alias['seo_redirect'] != ''){
+ if($alias['seo_redirect'] != '' && $data['new']['seo_redirect'] != '*_to_www_domain_tld' && $data['new']['seo_redirect'] != '*_to_domain_tld'){
$tmp_seo_redirects = $this->get_seo_redirects($alias, 'alias_');
if(is_array($tmp_seo_redirects) && !empty($tmp_seo_redirects)){
$alias_seo_redirects[] = $tmp_seo_redirects;
--
Gitblit v1.9.1