[php-blog-cvs] serendipity/include/tpl htaccess_cgi_rewrite.tpl,1.4,1.5 htaccess_rewrite.tpl,1.4,1.5

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/include/tpl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16871/include/tpl

Modified Files:
	htaccess_cgi_rewrite.tpl htaccess_rewrite.tpl 
Log Message:
* Allow pagination for searched entries
* Pretty URLs for search: http://blog/search/SEARCHTERM and
  http://blog/search/SEARCHTERM/Pn.html for succeeding pages

- Requires version bump to work with mod_rewrite (not done yet, waiting
  for Tom)
- Done in a BC compatible way
- Needed to adjust RegExp for parsing uriArguments variable, because
  "%" and "+" signs need to be allowed to search for Umlauts etc.
  Please check if that may break things (don't know of any)



Index: htaccess_rewrite.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/tpl/htaccess_rewrite.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- htaccess_rewrite.tpl	29 Nov 2004 09:55:11 -0000	1.4
+++ htaccess_rewrite.tpl	10 Jan 2005 13:12:56 -0000	1.5
@@ -18,6 +18,7 @@
 RewriteRule ^{PAT_CATEGORIES} {indexFile}?url=/{PATH_CATEGORIES}/$1 [L,QSA]
 RewriteRule ^{PAT_FEED} rss.php?file=$1&ext=$2
 RewriteRule ^{PAT_PLUGIN} {indexFile}?url=plugin/$1 [L,QSA]
+RewriteRule ^{PAT_SEARCH} {indexFile}?url=/{PATH_SEARCH}/$1 [L,QSA]
 RewriteRule ^index\.(html?|php.?) {indexFile}?url=index.html [L,QSA]
 RewriteRule ^htmlarea/(.*) htmlarea/$1 [L,QSA]
 RewriteRule (.*\.html?) {indexFile}?url=/$1 [L,QSA]

Index: htaccess_cgi_rewrite.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/tpl/htaccess_cgi_rewrite.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- htaccess_cgi_rewrite.tpl	29 Nov 2004 09:55:11 -0000	1.4
+++ htaccess_cgi_rewrite.tpl	10 Jan 2005 13:12:56 -0000	1.5
@@ -16,6 +16,7 @@
 RewriteRule ^{PAT_CATEGORIES} {indexFile}?url=/{PATH_CATEGORIES}/$1 [L,QSA]
 RewriteRule ^{PAT_FEED} rss.php?file=$1&ext=$2
 RewriteRule ^{PAT_PLUGIN} {indexFile}?url=plugin/$1 [L,QSA]
+RewriteRule ^{PAT_SEARCH} {indexFile}?url=/{PATH_SEARCH}/$1 [L,QSA]
 RewriteRule ^index\.(html?|php.?) {indexFile}?url=index.html [L,QSA]
 RewriteRule ^htmlarea/(.*) htmlarea/$1 [L,QSA]
 RewriteRule (.*\.html?) {indexFile}?url=/$1 [L,QSA]