From 83cf118fd9f36797e29210e8903385045f621280 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Sun, 04 Nov 2012 11:54:53 -0500
Subject: [PATCH] - Changing nginx rewrite rules - CONTINUED.
---
server/plugins-available/nginx_plugin.inc.php | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
index 279ddf6..a9d55fd 100644
--- a/server/plugins-available/nginx_plugin.inc.php
+++ b/server/plugins-available/nginx_plugin.inc.php
@@ -956,7 +956,7 @@
$vhost_data['web_document_root_www'] .= $data['new']['redirect_path'];
break;
}
- $rewrite_exclude = '((?!'.substr($data['new']['redirect_path'],0,-1).'))';
+ $rewrite_exclude = '(?!(/'.substr($data['new']['redirect_path'],1,-1).'|stats'.($vhost_data['errordocs'] == 1 ? '|error' : '').')/)';
} 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);
@@ -970,7 +970,7 @@
$vhost_data['web_document_root_www'] .= $tmp_redirect_path_parts['path'];
break;
} else {
-
+ $rewrite_exclude = '(?!(/'.substr($tmp_redirect_path_parts['path'],1).'|stats'.($vhost_data['errordocs'] == 1 ? '|error' : '').')/)';
}
} else {
// external URL
@@ -986,7 +986,7 @@
}
$own_rewrite_rules[] = array( 'rewrite_domain' => '^'.$this->_rewrite_quote($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_type'] != 'internal' && ($data['new']['redirect_type'] == 'redirect' || $data['new']['redirect_type'] == 'permanent')? substr($data['new']['redirect_path'],0,-1) : $data['new']['redirect_path']),
'rewrite_exclude' => $rewrite_exclude,
'use_rewrite' => ($data['new']['redirect_type'] == 'internal' ? false:true),
'use_internal' => ($data['new']['redirect_type'] == 'internal' ? true:false));
--
Gitblit v1.9.1