From c16e77cadf5a4d7940df8aef1131615c3a105f38 Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Wed, 14 Nov 2012 06:03:53 -0500
Subject: [PATCH] Updated: Do not add $1 to redirect path on RewriteRule if there is no trailing /

---
 server/plugins-available/nginx_plugin.inc.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
index 9be5594..fddfd54 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'] != '' && $data['new']['seo_redirect'] != '*_to_www_domain_tld' && $data['new']['seo_redirect'] != '*_to_domain_tld'){
+					if($alias['seo_redirect'] != '' && $data['new']['seo_redirect'] != '*_to_www_domain_tld' && $data['new']['seo_redirect'] != '*_to_domain_tld' && ($alias['type'] == 'alias' || ($alias['type'] == 'subdomain' && $data['new']['seo_redirect'] != '*_domain_tld_to_www_domain_tld' && $data['new']['seo_redirect'] != '*_domain_tld_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