[php-blog-cvs] serendipity htaccess.cgi.rewrite.tpl,1.3,1.4 htaccess.rewrite.tpl,1.16,1.17 serendipity_config.inc.php,1.96,1.97

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

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

Modified Files:
	htaccess.cgi.rewrite.tpl htaccess.rewrite.tpl 
	serendipity_config.inc.php 
Log Message:
Fixed bad regular expressions which borked mod_rewrite. It does not seem
to support the \d shortcut. :(


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- serendipity_config.inc.php	1 Oct 2004 14:23:45 -0000	1.96
+++ serendipity_config.inc.php	7 Oct 2004 13:58:58 -0000	1.97
@@ -69,21 +69,22 @@
 @define('PATH_PLUGIN', 'plugin');
 
 /* URI patterns
- * Note that it's important to use @ as the pattern delimiter.
+ * Note that it's important to use @ as the pattern delimiter. DO NOT use shortcuts
+ * like \d or \s, since mod_rewrite will use the regexps as well and chokes on them.
  */
 @define('PAT_FILENAME', '0-9a-z\.\_!;,\+\-');
 @define('PAT_UNSUBSCRIBE', '@/'.PATH_UNSUBSCRIBE.'/(.*)/([0-9]+)@');
 @define('PAT_APPROVE', '@/'.PATH_APPROVE.'/(.*)/(.*)/([0-9]+)@');
 @define('PAT_DELETE', '@/'.PATH_DELETE.'/(.*)/(.*)/([0-9]+)@');
-@define('PAT_ARCHIVES', '@/'.PATH_ARCHIVES.'/(\d+)\.html@');
-@define('PAT_ARCHIVES_SHORT', '@/'.PATH_ARCHIVES.'/(\d+)[_\-]short\.html@');
-@define('PAT_COMMENTSUB', '@/(\d+)[_\-][' . PAT_FILENAME . ']*\.html@i');
+@define('PAT_ARCHIVES', '@/'.PATH_ARCHIVES.'/([0-9]+)\.html@');
+@define('PAT_ARCHIVES_SHORT', '@/'.PATH_ARCHIVES.'/([0-9]+)[_\-]short\.html@');
+@define('PAT_COMMENTSUB', '@/([0-9]+)[_\-][' . PAT_FILENAME . ']*\.html@i');
 @define('PAT_FEEDS', '@/'.PATH_FEEDS.'/@');
 @define('PAT_FEED', '@/(index|atom|rss|b2rss|b2rdf).(rss|rdf|rss2|xml)$@');
 @define('PAT_ADMIN', '@/'.PATH_ADMIN.'$@');
 @define('PAT_ENTRIES', '@/'.PATH_ENTRIES.'$@');
 @define('PAT_ARCHIVE', '@/'.PATH_ARCHIVE.'$@');
-@define('PAT_CATEGORIES', '@/'.PATH_CATEGORIES.'/(\d+)[_\-].*@');
+@define('PAT_CATEGORIES', '@/'.PATH_CATEGORIES.'/([0-9]+)@');
 @define('PAT_PLUGIN', '@/' . PATH_PLUGIN . '/(.*)@');
 
 @define('USERLEVEL_ADMIN', 255);

Index: htaccess.cgi.rewrite.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htaccess.cgi.rewrite.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- htaccess.cgi.rewrite.tpl	30 Aug 2004 14:20:07 -0000	1.3
+++ htaccess.cgi.rewrite.tpl	7 Oct 2004 13:58:57 -0000	1.4
@@ -14,7 +14,7 @@
 RewriteRule ^{PAT_ADMIN} serendipity_admin.php [L,QSA]
 RewriteRule ^{PAT_ENTRIES} serendipity_entries.php [L,QSA]
 RewriteRule ^{PAT_ARCHIVE} {indexFile}?url=/{PATH_ARCHIVE} [L,QSA]
-RewriteRule ^{PAT_CATEGORIES} {indexFile}?url={PATH_ARCHIVE}/$1 [L,QSA]
+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 ^index\.(html?|php.?) {indexFile}?url=index.html [L,QSA]

Index: htaccess.rewrite.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htaccess.rewrite.tpl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- htaccess.rewrite.tpl	30 Aug 2004 14:20:14 -0000	1.16
+++ htaccess.rewrite.tpl	7 Oct 2004 13:58:58 -0000	1.17
@@ -16,7 +16,7 @@
 RewriteRule ^{PAT_ADMIN} serendipity_admin.php [L,QSA]
 RewriteRule ^{PAT_ENTRIES} serendipity_entries.php [L,QSA]
 RewriteRule ^{PAT_ARCHIVE} {indexFile}?url=/{PATH_ARCHIVE} [L,QSA]
-RewriteRule ^{PAT_CATEGORIES} {indexFile}?url={PATH_ARCHIVE}/$1 [L,QSA]
+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 ^index\.(html?|php.?) {indexFile}?url=index.html [L,QSA]