From: garvinhicking <garvinhicking>
Date: Fri, 4 Nov 2005 13:28:27 +0000 (+0000)
Subject: backpirt
X-Git-Tag: 0.9.1~43
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=d9a07deb1ed1ad0cdc6237c7fc61c1b0a412e909;p=s9y.git

backpirt
---

diff --git a/docs/NEWS b/docs/NEWS
index ebb8d56..8ba3a1d 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -3,6 +3,9 @@
 Version 0.9.1 ()
 ------------------------------------------------------------------------
 
+    * Fix mod_rewrite rules to not differentiate on case-sensitivity for
+      authors, archives and category URLs (garvinhicking)
+          
     * Fix a bug in the serendipity_currentURL function when Serendipity
       is installed in your HTTP root. This bug only effects the plugins karma,
       entrysplit and multilingual on these installations.
diff --git a/include/functions_installer.inc.php b/include/functions_installer.inc.php
index 2928292..bf78129 100644
--- a/include/functions_installer.inc.php
+++ b/include/functions_installer.inc.php
@@ -700,6 +700,7 @@ function serendipity_installFiles($serendipity_core = '') {
                    '{PAT_PERMALINK_AUTHORS}',
                    '{PAT_PERMALINK_FEEDCATEGORIES}',
                    '{PAT_PERMALINK_CATEGORIES}',
+                   '{PAT_PERMALINK_FEEDAUTHORS}'
                  ),
 
                  array(
@@ -720,6 +721,7 @@ function serendipity_installFiles($serendipity_core = '') {
                    trim($PAT['PERMALINK_AUTHORS'], '@/i'),
                    trim($PAT['PERMALINK_FEEDCATEGORIES'], '@/i'),
                    trim($PAT['PERMALINK_CATEGORIES'], '@/i'),
+                   trim($PAT['PERMALINK_FEEDAUTHORS'], '@/i')
                  ),
 
                  implode('', $a)
diff --git a/include/tpl/htaccess_cgi_rewrite.tpl b/include/tpl/htaccess_cgi_rewrite.tpl
index 546fe4f..3529b5f 100644
--- a/include/tpl/htaccess_cgi_rewrite.tpl
+++ b/include/tpl/htaccess_cgi_rewrite.tpl
@@ -4,12 +4,12 @@ DirectoryIndex {PREFIX}{indexFile}
 
 RewriteEngine On
 RewriteBase {PREFIX}
-RewriteRule ^({PAT_PERMALINK}) {indexFile}?/$1 [L,QSA]
-RewriteRule ^({PAT_PERMALINK_AUTHORS}) {indexFile}?/$1 [L,QSA]
-RewriteRule ^({PAT_PERMALINK_FEEDCATEGORIES}) {indexFile}?/$1 [L,QSA]
-RewriteRule ^({PAT_PERMALINK_FEEDAUTHORS}) {indexFile}?/$1 [L,QSA]
-RewriteRule ^({PAT_PERMALINK_CATEGORIES}) {indexFile}?/$1 [L,QSA]
-RewriteRule ^{PAT_ARCHIVES} {indexFile}?url=/{PATH_ARCHIVES}/$1.html [L,QSA]
+RewriteRule ^({PAT_PERMALINK}) {indexFile}?/$1 [NC,L,QSA]
+RewriteRule ^({PAT_PERMALINK_AUTHORS}) {indexFile}?/$1 [NC,L,QSA]
+RewriteRule ^({PAT_PERMALINK_FEEDCATEGORIES}) {indexFile}?/$1 [NC,L,QSA]
+RewriteRule ^({PAT_PERMALINK_FEEDAUTHORS}) {indexFile}?/$1 [NC,L,QSA]
+RewriteRule ^({PAT_PERMALINK_CATEGORIES}) {indexFile}?/$1 [NC,L,QSA]
+RewriteRule ^{PAT_ARCHIVES} {indexFile}?url=/{PATH_ARCHIVES}/$1.html [NC,L,QSA]
 RewriteRule ^([0-9]+)[_\-][0-9a-z_\-]*\.html {indexFile}?url=$1-article.html [L,NC,QSA]
 RewriteRule ^{PAT_FEEDS}/(.*) {indexFile}?url=/{PATH_FEEDS}/$1 [L,QSA]
 RewriteRule ^{PAT_UNSUBSCRIBE} {indexFile}?url=/{PATH_UNSUBSCRIBE}/$1/$2 [L,QSA]
diff --git a/include/tpl/htaccess_rewrite.tpl b/include/tpl/htaccess_rewrite.tpl
index d74a8ad..764de68 100644
--- a/include/tpl/htaccess_rewrite.tpl
+++ b/include/tpl/htaccess_rewrite.tpl
@@ -6,12 +6,12 @@ php_value register_globals off
 
 RewriteEngine On
 RewriteBase {PREFIX}
-RewriteRule ^({PAT_PERMALINK}) {indexFile}?/$1 [L,QSA]
-RewriteRule ^({PAT_PERMALINK_AUTHORS}) {indexFile}?/$1 [L,QSA]
-RewriteRule ^({PAT_PERMALINK_FEEDCATEGORIES}) {indexFile}?/$1 [L,QSA]
-RewriteRule ^({PAT_PERMALINK_FEEDAUTHORS}) {indexFile}?/$1 [L,QSA]
-RewriteRule ^({PAT_PERMALINK_CATEGORIES}) {indexFile}?/$1 [L,QSA]
-RewriteRule ^{PAT_ARCHIVES} {indexFile}?url=/{PATH_ARCHIVES}/$1.html [L,QSA]
+RewriteRule ^({PAT_PERMALINK}) {indexFile}?/$1 [NC,L,QSA]
+RewriteRule ^({PAT_PERMALINK_AUTHORS}) {indexFile}?/$1 [NC,L,QSA]
+RewriteRule ^({PAT_PERMALINK_FEEDCATEGORIES}) {indexFile}?/$1 [NC,L,QSA]
+RewriteRule ^({PAT_PERMALINK_FEEDAUTHORS}) {indexFile}?/$1 [NC,L,QSA]
+RewriteRule ^({PAT_PERMALINK_CATEGORIES}) {indexFile}?/$1 [NC,L,QSA]
+RewriteRule ^{PAT_ARCHIVES} {indexFile}?url=/{PATH_ARCHIVES}/$1.html [NC,L,QSA]
 RewriteRule ^([0-9]+)[_\-][0-9a-z_\-]*\.html {indexFile}?url=$1-article.html [L,NC,QSA]
 RewriteRule ^{PAT_FEEDS}/(.*) {indexFile}?url=/{PATH_FEEDS}/$1 [L,QSA]
 RewriteRule ^{PAT_UNSUBSCRIBE} {indexFile}?url=/{PATH_UNSUBSCRIBE}/$1/$2 [L,QSA]