fix case insensitivity issue on mod_rewrite

diff --git a/docs/NEWS b/docs/NEWS
index a8277a2b76d64a1cfda082e624f8ea0bcf422760..c0def535c051bc7fef54fcfebce079cd551b9f22 100644 (file)
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -10,6 +10,9 @@ Version 1.0 ()
 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 29282924281bf9a2c56d997998cd5d6c80cdea8e..bf78129f81fdaaf938aa342f45ead6195de8786d 100644 (file)
--- 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 546fe4f2136b7fa7ec4d2e897b4c542bb9c4e79c..3529b5f96fc171f91c49a406a5721786d7657eba 100644 (file)
--- 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 d74a8ad5f42613c7d0937a0ad6db3dede792366a..764de68bcde5d5b81f6a95a8ebda51212812b501 100644 (file)
--- 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]