php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity/lang serendipity_lang_bg.inc.php,1.15.2.4,1.15.2.5 serendipity_lang_cs.inc.php,1.61.2.4,1.61.2.5 serendipity_lang_cz.inc.php,1.61.2.3,1.61.2.4 serendipity_lang_da.inc.php,1.79.2.5,1.79.2.6 serendipity_lang_de.inc.php,1.98.2.4,1.98.2.5 serendipity_lang_en.inc.php,1.79.2.6,1.79.2.7 serendipity_lang_es.inc.php,1.77.2.4,1.77.2.5 serendipity_lang_fr.inc.php,1.58.2.5,1.58.2.6 serendipity_lang_it.inc.php,1.1.2.4,1.1.2.5 serendipity_lang_nl.inc.php,1.36.2.4,1.36.2.5 serendipity_lang_no.inc.php,1.2.2.4,1.2.2.5 serendipity_lang_pt.inc.php,1.36.2.5,1.36.2.6

[Tom S. <tom...@us...>]

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

Modified Files:
      Tag: branch-smarty
	serendipity_lang_bg.inc.php serendipity_lang_cs.inc.php 
	serendipity_lang_cz.inc.php serendipity_lang_da.inc.php 
	serendipity_lang_de.inc.php serendipity_lang_en.inc.php 
	serendipity_lang_es.inc.php serendipity_lang_fr.inc.php 
	serendipity_lang_it.inc.php serendipity_lang_nl.inc.php 
	serendipity_lang_no.inc.php serendipity_lang_pt.inc.php 
Log Message:
Extended path rewrite:
- Use diffirent URI for browsing months
- Allow the browsing of weeks
- Call "-short" "/summary"
- Use rewritten links in syndication plugin
- Allow access to rss1.0 feeds through rewritten URLs
- Allow access to comment feeds by doing /feeds/comments.(rss|atom|rss1|rss2)
- Add the ability to show months, weeks or days in the archive plugin sidebar
- Add the ability to define how many months, weeks or days that should be displayed in the archive plugin sidebar
- Implement serendipity_rewriteURL() to handle all the rewrite path logic, makes the code MUCH cleaner


TODO: Needs version bump, but I want to have it tested before we do so
TODO: The [RSS] buttons for the category listing still uses the old rss.php syntax, need to figure out how to solve that


Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.61.2.4
retrieving revision 1.61.2.5
diff -u -d -r1.61.2.4 -r1.61.2.5
--- serendipity_lang_cs.inc.php	11 Oct 2004 22:32:47 -0000	1.61.2.4
+++ serendipity_lang_cs.inc.php	16 Oct 2004 17:27:13 -0000	1.61.2.5
@@ -570,5 +570,13 @@
 @define('COULDNT_SELECT_CATEGORY_INFO', 'Could not select category information: %s.'); // Translate
 @define('COULDNT_SELECT_ENTRY_INFO', 'Could not select entry information: %s.'); // Translate
 @define('COULDNT_SELECT_COMMENT_INFO', 'Could not select comment information: %s.'); // Translate
+@define('WEEK', 'Week'); // Translate
+@define('WEEKS', 'Weeks'); // Translate
+@define('MONTHS', 'Months'); // Translate
+@define('DAYS', 'Days'); // Translate
+@define('ARCHIVE_FREQUENCY', 'Calendar item frequency'); // Translate
+@define('ARCHIVE_FREQUENCY_DESC', 'The calendar interval to use between each item in the list'); // Translate
+@define('ARCHIVE_COUNT', 'Number of items in the list'); // Translate
+@define('ARCHIVE_COUNT_DESC', 'The total number of months, weeks or days to display'); // Translate
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_no.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_no.inc.php,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.5
diff -u -d -r1.2.2.4 -r1.2.2.5
--- serendipity_lang_no.inc.php	11 Oct 2004 22:32:48 -0000	1.2.2.4
+++ serendipity_lang_no.inc.php	16 Oct 2004 17:27:14 -0000	1.2.2.5
@@ -565,4 +565,12 @@
 @define('COULDNT_SELECT_CATEGORY_INFO', 'Could not select category information: %s.'); // Translate
 @define('COULDNT_SELECT_ENTRY_INFO', 'Could not select entry information: %s.'); // Translate
 @define('COULDNT_SELECT_COMMENT_INFO', 'Could not select comment information: %s.'); // Translate
+@define('WEEK', 'Week'); // Translate
+@define('WEEKS', 'Weeks'); // Translate
+@define('MONTHS', 'Months'); // Translate
+@define('DAYS', 'Days'); // Translate
+@define('ARCHIVE_FREQUENCY', 'Calendar item frequency'); // Translate
+@define('ARCHIVE_FREQUENCY_DESC', 'The calendar interval to use between each item in the list'); // Translate
+@define('ARCHIVE_COUNT', 'Number of items in the list'); // Translate
+@define('ARCHIVE_COUNT_DESC', 'The total number of months, weeks or days to display'); // Translate
 ?>
\ No newline at end of file

Index: serendipity_lang_nl.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_nl.inc.php,v
retrieving revision 1.36.2.4
retrieving revision 1.36.2.5
diff -u -d -r1.36.2.4 -r1.36.2.5
--- serendipity_lang_nl.inc.php	11 Oct 2004 22:32:48 -0000	1.36.2.4
+++ serendipity_lang_nl.inc.php	16 Oct 2004 17:27:14 -0000	1.36.2.5
@@ -575,6 +575,14 @@
 @define('COULDNT_SELECT_CATEGORY_INFO', 'Could not select category information: %s.'); // Translate
 @define('COULDNT_SELECT_ENTRY_INFO', 'Could not select entry information: %s.'); // Translate
 @define('COULDNT_SELECT_COMMENT_INFO', 'Could not select comment information: %s.'); // Translate
+@define('WEEK', 'Week'); // Translate
+@define('WEEKS', 'Weeks'); // Translate
+@define('MONTHS', 'Months'); // Translate
+@define('DAYS', 'Days'); // Translate
+@define('ARCHIVE_FREQUENCY', 'Calendar item frequency'); // Translate
+@define('ARCHIVE_FREQUENCY_DESC', 'The calendar interval to use between each item in the list'); // Translate
+@define('ARCHIVE_COUNT', 'Number of items in the list'); // Translate
+@define('ARCHIVE_COUNT_DESC', 'The total number of months, weeks or days to display'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.79.2.6
retrieving revision 1.79.2.7
diff -u -d -r1.79.2.6 -r1.79.2.7
--- serendipity_lang_en.inc.php	11 Oct 2004 22:32:48 -0000	1.79.2.6
+++ serendipity_lang_en.inc.php	16 Oct 2004 17:27:14 -0000	1.79.2.7
@@ -567,5 +567,15 @@
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval');
 @define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.');
 @define('SYNDICATION_PLUGIN_FULLFEED', 'Show full articles with extended body inside RSS feed');
+@define('WEEK', 'Week');
+@define('WEEKS', 'Weeks');
+@define('MONTHS', 'Months');
+@define('DAYS', 'Days');
+@define('ARCHIVE_FREQUENCY', 'Calendar item frequency');
+@define('ARCHIVE_FREQUENCY_DESC', 'The calendar interval to use between each item in the list');
+@define('ARCHIVE_COUNT', 'Number of items in the list');
+@define('ARCHIVE_COUNT_DESC', 'The total number of months, weeks or days to display');
+
+
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_bg.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_bg.inc.php,v
retrieving revision 1.15.2.4
retrieving revision 1.15.2.5
diff -u -d -r1.15.2.4 -r1.15.2.5
--- serendipity_lang_bg.inc.php	11 Oct 2004 22:32:47 -0000	1.15.2.4
+++ serendipity_lang_bg.inc.php	16 Oct 2004 17:27:13 -0000	1.15.2.5
@@ -552,5 +552,13 @@
 @define('COULDNT_SELECT_CATEGORY_INFO', 'Could not select category information: %s.'); // Translate
 @define('COULDNT_SELECT_ENTRY_INFO', 'Could not select entry information: %s.'); // Translate
 @define('COULDNT_SELECT_COMMENT_INFO', 'Could not select comment information: %s.'); // Translate
+@define('WEEK', 'Week'); // Translate
+@define('WEEKS', 'Weeks'); // Translate
+@define('MONTHS', 'Months'); // Translate
+@define('DAYS', 'Days'); // Translate
+@define('ARCHIVE_FREQUENCY', 'Calendar item frequency'); // Translate
+@define('ARCHIVE_FREQUENCY_DESC', 'The calendar interval to use between each item in the list'); // Translate
+@define('ARCHIVE_COUNT', 'Number of items in the list'); // Translate
+@define('ARCHIVE_COUNT_DESC', 'The total number of months, weeks or days to display'); // Translate
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_pt.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_pt.inc.php,v
retrieving revision 1.36.2.5
retrieving revision 1.36.2.6
diff -u -d -r1.36.2.5 -r1.36.2.6
--- serendipity_lang_pt.inc.php	11 Oct 2004 22:32:48 -0000	1.36.2.5
+++ serendipity_lang_pt.inc.php	16 Oct 2004 17:27:15 -0000	1.36.2.6
@@ -571,6 +571,14 @@
 @define('COULDNT_SELECT_CATEGORY_INFO', 'Could not select category information: %s.'); // Translate
 @define('COULDNT_SELECT_ENTRY_INFO', 'Could not select entry information: %s.'); // Translate
 @define('COULDNT_SELECT_COMMENT_INFO', 'Could not select comment information: %s.'); // Translate
+@define('WEEK', 'Week'); // Translate
+@define('WEEKS', 'Weeks'); // Translate
+@define('MONTHS', 'Months'); // Translate
+@define('DAYS', 'Days'); // Translate
+@define('ARCHIVE_FREQUENCY', 'Calendar item frequency'); // Translate
+@define('ARCHIVE_FREQUENCY_DESC', 'The calendar interval to use between each item in the list'); // Translate
+@define('ARCHIVE_COUNT', 'Number of items in the list'); // Translate
+@define('ARCHIVE_COUNT_DESC', 'The total number of months, weeks or days to display'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_it.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_it.inc.php,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- serendipity_lang_it.inc.php	11 Oct 2004 22:32:48 -0000	1.1.2.4
+++ serendipity_lang_it.inc.php	16 Oct 2004 17:27:14 -0000	1.1.2.5
@@ -567,6 +567,14 @@
 @define('COULDNT_SELECT_CATEGORY_INFO', 'Could not select category information: %s.'); // Translate
 @define('COULDNT_SELECT_ENTRY_INFO', 'Could not select entry information: %s.'); // Translate
 @define('COULDNT_SELECT_COMMENT_INFO', 'Could not select comment information: %s.'); // Translate
+@define('WEEK', 'Week'); // Translate
+@define('WEEKS', 'Weeks'); // Translate
+@define('MONTHS', 'Months'); // Translate
+@define('DAYS', 'Days'); // Translate
+@define('ARCHIVE_FREQUENCY', 'Calendar item frequency'); // Translate
+@define('ARCHIVE_FREQUENCY_DESC', 'The calendar interval to use between each item in the list'); // Translate
+@define('ARCHIVE_COUNT', 'Number of items in the list'); // Translate
+@define('ARCHIVE_COUNT_DESC', 'The total number of months, weeks or days to display'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_da.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v
retrieving revision 1.79.2.5
retrieving revision 1.79.2.6
diff -u -d -r1.79.2.5 -r1.79.2.6
--- serendipity_lang_da.inc.php	11 Oct 2004 22:32:48 -0000	1.79.2.5
+++ serendipity_lang_da.inc.php	16 Oct 2004 17:27:13 -0000	1.79.2.6
@@ -565,5 +565,13 @@
 @define('COULDNT_SELECT_CATEGORY_INFO', 'Could not select category information: %s.'); // Translate
 @define('COULDNT_SELECT_ENTRY_INFO', 'Could not select entry information: %s.'); // Translate
 @define('COULDNT_SELECT_COMMENT_INFO', 'Could not select comment information: %s.'); // Translate
+@define('WEEK', 'Week'); // Translate
+@define('WEEKS', 'Weeks'); // Translate
+@define('MONTHS', 'Months'); // Translate
+@define('DAYS', 'Days'); // Translate
+@define('ARCHIVE_FREQUENCY', 'Calendar item frequency'); // Translate
+@define('ARCHIVE_FREQUENCY_DESC', 'The calendar interval to use between each item in the list'); // Translate
+@define('ARCHIVE_COUNT', 'Number of items in the list'); // Translate
+@define('ARCHIVE_COUNT_DESC', 'The total number of months, weeks or days to display'); // Translate
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_fr.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fr.inc.php,v
retrieving revision 1.58.2.5
retrieving revision 1.58.2.6
diff -u -d -r1.58.2.5 -r1.58.2.6
--- serendipity_lang_fr.inc.php	11 Oct 2004 22:32:48 -0000	1.58.2.5
+++ serendipity_lang_fr.inc.php	16 Oct 2004 17:27:14 -0000	1.58.2.6
@@ -573,5 +573,13 @@
 @define('COULDNT_SELECT_CATEGORY_INFO', 'Could not select category information: %s.'); // Translate
 @define('COULDNT_SELECT_ENTRY_INFO', 'Could not select entry information: %s.'); // Translate
 @define('COULDNT_SELECT_COMMENT_INFO', 'Could not select comment information: %s.'); // Translate
+@define('WEEK', 'Week'); // Translate
+@define('WEEKS', 'Weeks'); // Translate
+@define('MONTHS', 'Months'); // Translate
+@define('DAYS', 'Days'); // Translate
+@define('ARCHIVE_FREQUENCY', 'Calendar item frequency'); // Translate
+@define('ARCHIVE_FREQUENCY_DESC', 'The calendar interval to use between each item in the list'); // Translate
+@define('ARCHIVE_COUNT', 'Number of items in the list'); // Translate
+@define('ARCHIVE_COUNT_DESC', 'The total number of months, weeks or days to display'); // Translate
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_cz.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cz.inc.php,v
retrieving revision 1.61.2.3
retrieving revision 1.61.2.4
diff -u -d -r1.61.2.3 -r1.61.2.4
--- serendipity_lang_cz.inc.php	11 Oct 2004 09:21:16 -0000	1.61.2.3
+++ serendipity_lang_cz.inc.php	16 Oct 2004 17:27:13 -0000	1.61.2.4
@@ -553,5 +553,13 @@
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate
 @define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate
 @define('SYNDICATION_PLUGIN_FULLFEED', 'Show full articles with extended body inside RSS feed'); // Translate
+@define('WEEK', 'Week'); // Translate
+@define('WEEKS', 'Weeks'); // Translate
+@define('MONTHS', 'Months'); // Translate
+@define('DAYS', 'Days'); // Translate
+@define('ARCHIVE_FREQUENCY', 'Calendar item frequency'); // Translate
+@define('ARCHIVE_FREQUENCY_DESC', 'The calendar interval to use between each item in the list'); // Translate
+@define('ARCHIVE_COUNT', 'Number of items in the list'); // Translate
+@define('ARCHIVE_COUNT_DESC', 'The total number of months, weeks or days to display'); // Translate
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_es.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v
retrieving revision 1.77.2.4
retrieving revision 1.77.2.5
diff -u -d -r1.77.2.4 -r1.77.2.5
--- serendipity_lang_es.inc.php	11 Oct 2004 22:32:48 -0000	1.77.2.4
+++ serendipity_lang_es.inc.php	16 Oct 2004 17:27:14 -0000	1.77.2.5
@@ -574,5 +574,13 @@
 @define('COULDNT_SELECT_CATEGORY_INFO', 'Could not select category information: %s.'); // Translate
 @define('COULDNT_SELECT_ENTRY_INFO', 'Could not select entry information: %s.'); // Translate
 @define('COULDNT_SELECT_COMMENT_INFO', 'Could not select comment information: %s.'); // Translate
+@define('WEEK', 'Week'); // Translate
+@define('WEEKS', 'Weeks'); // Translate
+@define('MONTHS', 'Months'); // Translate
+@define('DAYS', 'Days'); // Translate
+@define('ARCHIVE_FREQUENCY', 'Calendar item frequency'); // Translate
+@define('ARCHIVE_FREQUENCY_DESC', 'The calendar interval to use between each item in the list'); // Translate
+@define('ARCHIVE_COUNT', 'Number of items in the list'); // Translate
+@define('ARCHIVE_COUNT_DESC', 'The total number of months, weeks or days to display'); // Translate
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.98.2.4
retrieving revision 1.98.2.5
diff -u -d -r1.98.2.4 -r1.98.2.5
--- serendipity_lang_de.inc.php	11 Oct 2004 22:32:48 -0000	1.98.2.4
+++ serendipity_lang_de.inc.php	16 Oct 2004 17:27:14 -0000	1.98.2.5
@@ -567,5 +567,13 @@
 @define('COULDNT_SELECT_CATEGORY_INFO', 'Could not select category information: %s.'); // Translate
 @define('COULDNT_SELECT_ENTRY_INFO', 'Could not select entry information: %s.'); // Translate
 @define('COULDNT_SELECT_COMMENT_INFO', 'Could not select comment information: %s.'); // Translate
+@define('WEEK', 'Week'); // Translate
+@define('WEEKS', 'Weeks'); // Translate
+@define('MONTHS', 'Months'); // Translate
+@define('DAYS', 'Days'); // Translate
+@define('ARCHIVE_FREQUENCY', 'Calendar item frequency'); // Translate
+@define('ARCHIVE_FREQUENCY_DESC', 'The calendar interval to use between each item in the list'); // Translate
+@define('ARCHIVE_COUNT', 'Number of items in the list'); // Translate
+@define('ARCHIVE_COUNT_DESC', 'The total number of months, weeks or days to display'); // Translate
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

[php-blog-cvs] serendipity NEWS,1.214.2.35,1.214.2.36 index.php,1.49.2.6,1.49.2.7 rss.php,1.28.2.2,1.28.2.3 serendipity_config.inc.php,1.93.2.15,1.93.2.16 serendipity_functions.inc.php,1.419.2.51,1.419.2.52 serendipity_sidebar_items.php,1.84.2.7,1.84.2.8 serendipity_xmlrpc.php,1.16.2.1,1.16.2.2

[Tom S. <tom...@us...>]

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

Modified Files:
      Tag: branch-smarty
	NEWS index.php rss.php serendipity_config.inc.php 
	serendipity_functions.inc.php serendipity_sidebar_items.php 
	serendipity_xmlrpc.php 
Log Message:
Extended path rewrite:
- Use diffirent URI for browsing months
- Allow the browsing of weeks
- Call "-short" "/summary"
- Use rewritten links in syndication plugin
- Allow access to rss1.0 feeds through rewritten URLs
- Allow access to comment feeds by doing /feeds/comments.(rss|atom|rss1|rss2)
- Add the ability to show months, weeks or days in the archive plugin sidebar
- Add the ability to define how many months, weeks or days that should be displayed in the archive plugin sidebar
- Implement serendipity_rewriteURL() to handle all the rewrite path logic, makes the code MUCH cleaner


TODO: Needs version bump, but I want to have it tested before we do so
TODO: The [RSS] buttons for the category listing still uses the old rss.php syntax, need to figure out how to solve that


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.214.2.35
retrieving revision 1.214.2.36
diff -u -d -r1.214.2.35 -r1.214.2.36
--- NEWS	16 Oct 2004 09:12:15 -0000	1.214.2.35
+++ NEWS	16 Oct 2004 17:27:11 -0000	1.214.2.36
@@ -3,6 +3,15 @@
 Version 0.8 ()
 ------------------------------------------------------------------------
 
+    * Improve overall rewrite path syntax (tomsommer)
+
+    * Allow the display of month, weeks and days in archive sidebar
+      (tomsommer)
+
+    * Add ability to display entries based on week (tomsommer)
+
+    * Use rewrite paths in the syndication plugin (tomsommer)
+
     * Added import tool for Movable Type data files and WordPress
       databases. (tadpole9)
 

Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.93.2.15
retrieving revision 1.93.2.16
diff -u -d -r1.93.2.15 -r1.93.2.16
--- serendipity_config.inc.php	10 Oct 2004 00:39:07 -0000	1.93.2.15
+++ serendipity_config.inc.php	16 Oct 2004 17:27:12 -0000	1.93.2.16
@@ -77,8 +77,7 @@
 @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.'/([0-9]+)\.html@');
-@define('PAT_ARCHIVES_SHORT', '@/'.PATH_ARCHIVES.'/([0-9]+)[_\-]short\.html@');
+@define('PAT_ARCHIVES', '@/'.PATH_ARCHIVES.'([/A-Za-z0-9]+)\.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)$@');

Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.84.2.7
retrieving revision 1.84.2.8
diff -u -d -r1.84.2.7 -r1.84.2.8
--- serendipity_sidebar_items.php	11 Oct 2004 09:21:15 -0000	1.84.2.7
+++ serendipity_sidebar_items.php	16 Oct 2004 17:27:13 -0000	1.84.2.8
@@ -36,21 +36,17 @@
 
         $title = CALENDAR;
 
-        /* TODO: Patch this out */
-        if (!isset($serendipity['GET']['calendarZoom'])) {
-            if (!isset($serendipity['GET']['range'])) {
-                $calendarZoom = date('Y') . date('m');
-            } else {
-                $calendarZoom = $serendipity['GET']['range'];
-            }
-        } else {
-            $calendarZoom = $serendipity['GET']['calendarZoom'];
-        }
+         if (!isset($serendipity['GET']['calendarZoom'])) {
+            if (!isset($serendipity['range'])) {
+                $serendipity['GET']['calendarZoom'] = time();
+             } else {
+                $serendipity['GET']['calendarZoom'] = $serendipity['range'][0];
+             }
+         }
 
 
-        /* TODO: must change */
-        $year  = substr($calendarZoom, 0, 4);
-        $month = substr($calendarZoom, 4, 2);
+        $month = date('m', $serendipity['GET']['calendarZoom']);
+        $year  = date('Y', $serendipity['GET']['calendarZoom']);
 
         $bow = (int)$this->get_config('beginningOfWeek', 1);
         // Check for faulty input, is so - run the default
@@ -116,8 +112,8 @@
             $categoryid  = serendipity_db_escape_string($serendipity['GET']['category']);
 
             if (is_numeric($categoryid)) {
-                $base_query   = 'serendipity[category]=' . $categoryid;
-                $add_query    = '&' . $base_query;
+                $base_query   = 'C' . $categoryid;
+                $add_query    = '/' . $base_query;
                 $querystring = "SELECT timestamp
                                   FROM {$serendipity['dbPrefix']}entries e,
                                        {$serendipity['dbPrefix']}category c,
@@ -184,7 +180,7 @@
                     }
                     if (isset($activeDays[$currDay]) && $activeDays[$currDay] > 1) {
                         $cellProps['Active'] = 1;
-                        $cellProps['Link']   = serendipity_archiveDateUrl(sprintf('%4d%02d%02d', $year, $month, $currDay)) . $base_query;
+                        $cellProps['Link']   = serendipity_archiveDateUrl(sprintf('%4d/%02d/%02d', $year, $month, $currDay) . $add_query );
                     }
                     $currDay++;
                 }
@@ -204,9 +200,9 @@
 
 
         $serendipity['smarty']->assign('plugin_calendar_head', array('month_date'   => $ts,
-                                                                     'uri_previous' => $serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] .'?serendipity[calendarZoom]='. $previousYear . sprintf('%02d',$previousMonth) . $add_query,
-                                                                     'uri_month'    => serendipity_archiveDateUrl($year . sprintf('%02d', $month)) . $base_query,
-                                                                     'uri_next'     => $serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] .'?serendipity[calendarZoom]='. $previousYear . sprintf('%02d',$nextMonth) . $add_query,
+                                                                     'uri_previous' => serendipity_archiveDateUrl(sprintf('%04d/%02d', $previousYear, $previousMonth). $add_query),
+                                                                     'uri_month'    => serendipity_archiveDateUrl(sprintf('%04d/%02d', $year, $month)),
+                                                                     'uri_next'     => serendipity_archiveDateUrl(sprintf('%04d/%02d',$nextYear, $nextMonth) . $add_query),
                                                                      'minScroll'    => $minmax[0]['min'],
                                                                      'maxScroll'    => $minmax[0]['max']));
         echo serendipity_smarty_fetch('CALENDAR', 'plugin_calendar.tpl');
@@ -243,6 +239,30 @@
     {
         $propbag->add('name',        ARCHIVES);
         $propbag->add('description', BROWSE_ARCHIVES);
+        $propbag->add('configuration', array('frequency', 'count'));
+    }
+
+    function introspect_config_item($name, &$propbag)
+    {
+        switch($name) {
+            case 'count' :
+                $propbag->add('type', 'string');
+                $propbag->add('name', ARCHIVE_COUNT);
+                $propbag->add('description', ARCHIVE_COUNT_DESC);
+                $propbag->add('default', 3);
+                break;
+
+            case 'frequency' :
+                $propbag->add('type', 'select');
+                $propbag->add('name', ARCHIVE_FREQUENCY);
+                $propbag->add('select_values', array('months' => MONTHS, 'weeks' => WEEKS, 'days' => DAYS));
+                $propbag->add('description', ARCHIVE_FREQUENCY_DESC);
+                $propbag->add('default', 'months');
+                break;
+            default:
+                return false;
+        }
+        return true;
     }
 
     function generate_content(&$title)
@@ -251,22 +271,35 @@
 
         $title = ARCHIVES;
 
-        $ts = mktime(0, 0, 0, (date('m')+1), 1, date('Y'));
-
-        for($x = 0; $x < 3; $x++) {
-            $ts -= 1;
+        $ts = mktime(0, 0, 0);
 
-            $link = $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_ARCHIVES.'/' . date('Ym', $ts) . '.html';
+        for($x = 0; $x < $this->get_config('count', 3); $x++) {
 
-            $ts_title = ucfirst(strftime("%B %Y", $ts));
+            switch($this->get_config('frequency', 'months')) {
+                case 'months' :
+                    $linkStamp = date('Y/m', $ts);
+                    $ts_title = serendipity_formatTime("%B %Y", $ts);
+                    $ts = mktime(0, 0, 0, date('m', $ts)-1, 1, date('Y', $ts)); // Must be last in 'case' statement
+                    break;
+                case 'weeks' :
+                    $linkStamp = date('Y/\WW', $ts);
+                    $ts_title = WEEK . ' '. date('W, Y', $ts);
+                    $ts = mktime(0, 0, 0, date('m', $ts), date('d', $ts)-7, date('Y', $ts));
+                    break;
+                case 'days' :
+                    $linkStamp = date('Y/m/d', $ts);
+                    $ts_title = serendipity_formatTime("%B %e. %Y", $ts);
+                    $ts = mktime(0, 0, 0, date('m', $ts), date('d', $ts)-1, date('Y', $ts)); // Must be last in 'case' statement
+                    break;
+            }
+            $link = serendipity_rewriteURL(PATH_ARCHIVES.'/' . $linkStamp . '.html', 'serendipityHTTPPath');
 
             echo '<a href="' . $link . '" title="' . $ts_title . '">' . $ts_title . '</a><br />' . "\n";
 
-            $ts = mktime(0, 0, 0, date('m', $ts), 1, date('Y', $ts));
         }
 
-        echo "<a href='{$serendipity['serendipityHTTPPath']}'>" . RECENT . "</a><br />\n";
-        echo "<a href='{$serendipity['serendipityHTTPPath']}" . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_ARCHIVE."'>" . OLDER . "</a>\n";
+        echo '<a href="'. $serendipity['serendipityHTTPPath'] .'">' . RECENT . '</a><br />' . "\n";
+        echo '<a href="'. serendipity_rewriteURL(PATH_ARCHIVE) .'">' . OLDER . '</a>'. "\n";
     }
 }
 
@@ -537,8 +570,8 @@
         if (serendipity_db_bool($this->get_config('show_0.91', true))) {
 ?>
         <div style="padding-bottom: 2px;">
-            <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=0.91<?php echo $cache; ?>"><img src="<?php echo serendipity_getTemplateFile('img/xml.gif'); ?>" <?php echo ($serendipity['XHTML11'] ? 'style="border: 0px"' : 'border="0"'); ?> alt="XML" style="vertical-align: text-bottom" /></a>
-            <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=0.91<?php echo $cache; ?>">RSS 0.91 feed</a>
+            <a href="<?php echo serendipity_rewriteURL(PATH_FEEDS .'/index.rss', 'serendipityHTTPPath') ?>"><img src="<?php echo serendipity_getTemplateFile('img/xml.gif'); ?>" <?php echo ($serendipity['XHTML11'] ? 'style="border: 0px"' : 'border="0"'); ?> alt="XML" style="vertical-align: text-bottom" /></a>
+            <a href="<?php echo serendipity_rewriteURL(PATH_FEEDS .'/index.rss', 'serendipityHTTPPath') ?>">RSS 0.91 feed</a>
         </div>
 <?php
         }
@@ -546,8 +579,8 @@
         if (serendipity_db_bool($this->get_config('show_1.0', true))) {
 ?>
         <div style="padding-bottom: 2px;">
-            <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=1.0<?php echo $cache; ?>"><img src="<?php echo serendipity_getTemplateFile('img/xml.gif'); ?>" <?php echo ($serendipity['XHTML11'] ? 'style="border: 0px"' : 'border="0"'); ?> alt="XML" style="vertical-align: text-bottom" /></a>
-            <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=1.0<?php echo $cache; ?>">RSS 1.0 feed</a>
+            <a href="<?php echo serendipity_rewriteURL(PATH_FEEDS .'/index.rss1', 'serendipityHTTPPath') ?>"><img src="<?php echo serendipity_getTemplateFile('img/xml.gif'); ?>" <?php echo ($serendipity['XHTML11'] ? 'style="border: 0px"' : 'border="0"'); ?> alt="XML" style="vertical-align: text-bottom" /></a>
+            <a href="<?php echo serendipity_rewriteURL(PATH_FEEDS .'/index.rss1', 'serendipityHTTPPath') ?>">RSS 1.0 feed</a>
         </div>
 <?php
         }
@@ -555,8 +588,8 @@
         if (serendipity_db_bool($this->get_config('show_2.0', true))) {
 ?>
         <div style="padding-bottom: 2px;">
-            <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=2.0<?php echo $cache; ?>"><img src="<?php echo serendipity_getTemplateFile('img/xml.gif'); ?>" <?php echo ($serendipity['XHTML11'] ? 'style="border: 0px"' : 'border="0"'); ?> alt="XML" style="vertical-align: text-bottom" /></a>
-            <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=2.0<?php echo $cache; ?>">RSS 2.0 feed</a>
+            <a href="<?php echo serendipity_rewriteURL(PATH_FEEDS .'/index.rss2', 'serendipityHTTPPath') ?>"><img src="<?php echo serendipity_getTemplateFile('img/xml.gif'); ?>" <?php echo ($serendipity['XHTML11'] ? 'style="border: 0px"' : 'border="0"'); ?> alt="XML" style="vertical-align: text-bottom" /></a>
+            <a href="<?php echo serendipity_rewriteURL(PATH_FEEDS .'/index.rss2', 'serendipityHTTPPath') ?>">RSS 2.0 feed</a>
         </div>
 <?php
         }
@@ -564,8 +597,8 @@
         if (serendipity_db_bool($this->get_config('show_atom0.3', true))) {
 ?>
         <div style="padding-bottom: 2px;">
-            <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=atom0.3<?php echo $cache; ?>"><img src="<?php echo serendipity_getTemplateFile('img/xml.gif'); ?>" <?php echo ($serendipity['XHTML11'] ? 'style="border: 0px"' : 'border="0"'); ?> alt="ATOM/XML" style="vertical-align: text-bottom" /></a>
-            <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=atom0.3<?php echo $cache; ?>">ATOM 0.3 feed</a>
+            <a href="<?php echo serendipity_rewriteURL(PATH_FEEDS .'/atom.xml', 'serendipityHTTPPath') ?>"><img src="<?php echo serendipity_getTemplateFile('img/xml.gif'); ?>" <?php echo ($serendipity['XHTML11'] ? 'style="border: 0px"' : 'border="0"'); ?> alt="ATOM/XML" style="vertical-align: text-bottom" /></a>
+            <a href="<?php echo serendipity_rewriteURL(PATH_FEEDS .'/atom.xml', 'serendipityHTTPPath') ?>">ATOM 0.3 feed</a>
         </div>
 <?php
         }
@@ -573,8 +606,8 @@
         if (serendipity_db_bool($this->get_config('show_2.0c', true))) {
 ?>
         <div style="padding-bottom: 2px;">
-            <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=2.0&amp;type=comments<?php echo $cache; ?>"><img src="<?php echo serendipity_getTemplateFile('img/xml.gif'); ?>" <?php echo ($serendipity['XHTML11'] ? 'style="border: 0px"' : 'border="0"'); ?> alt="XML" style="vertical-align: text-bottom" /></a>
-            <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=2.0&amp;type=comments<?php echo $cache; ?>"><?php echo ($serendipity['XHTML11'] ? '<span style="white-space: nowrap">' : '<nobr>'); ?>RSS 2.0 <?php echo COMMENTS; ?><?php echo ($serendipity['XHTML11'] ? '</span>' : '</nobr>'); ?></a>
+            <a href="<?php echo serendipity_rewriteURL(PATH_FEEDS .'/comments.rss2', 'serendipityHTTPPath') ?>"><img src="<?php echo serendipity_getTemplateFile('img/xml.gif'); ?>" <?php echo ($serendipity['XHTML11'] ? 'style="border: 0px"' : 'border="0"'); ?> alt="XML" style="vertical-align: text-bottom" /></a>
+            <a href="<?php echo serendipity_rewriteURL(PATH_FEEDS .'/comments.rss2', 'serendipityHTTPPath') ?>"><?php echo ($serendipity['XHTML11'] ? '<span style="white-space: nowrap">' : '<nobr>'); ?>RSS 2.0 <?php echo COMMENTS; ?><?php echo ($serendipity['XHTML11'] ? '</span>' : '</nobr>'); ?></a>
         </div>
 <?php
         }
@@ -582,8 +615,8 @@
         if (serendipity_db_bool($this->get_config('show_opml1.0', false))) {
 ?>
         <div style="padding-bottom: 2px;">
-            <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=opml1.0<?php echo $cache; ?>"><img src="<?php echo serendipity_getTemplateFile('img/xml.gif'); ?>" <?php echo ($serendipity['XHTML11'] ? 'style="border: 0px"' : 'border="0"'); ?> alt="XML" style="vertical-align: text-bottom" /></a>
-            <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=opml1.0<?php echo $cache; ?>">OPML 1.0 feed</a>
+            <a href="<?php echo serendipity_rewriteURL(PATH_FEEDS .'/opml.xml', 'serendipityHTTPPath') ?>"><img src="<?php echo serendipity_getTemplateFile('img/xml.gif'); ?>" <?php echo ($serendipity['XHTML11'] ? 'style="border: 0px"' : 'border="0"'); ?> alt="XML" style="vertical-align: text-bottom" /></a>
+            <a href="<?php echo serendipity_rewriteURL(PATH_FEEDS .'/opml.xml', 'serendipityHTTPPath') ?>">OPML 1.0 feed</a>
         </div>
 <?php
         }

Index: serendipity_xmlrpc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_xmlrpc.php,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -u -d -r1.16.2.1 -r1.16.2.2
--- serendipity_xmlrpc.php	20 Sep 2004 14:00:39 -0000	1.16.2.1
+++ serendipity_xmlrpc.php	16 Oct 2004 17:27:13 -0000	1.16.2.2
@@ -484,8 +484,8 @@
         'mt_convert_breaks' => new XML_RPC_Value('', 'string'),
         'mt_keywords'       => new XML_RPC_Value('', 'string'),
         'title'             => new XML_RPC_Value($entry['title'],'string'),
-        'permalink'         => new XML_RPC_Value($serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? '/' . $serendipity['indexFile'] . '?' : '') . '/'.PATH_ARCHIVES.'/' . $postid . '_.html', 'string'),
-        'link'              => new XML_RPC_Value($serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? '/' . $serendipity['indexFile'] . '?' : '') . '/'.PATH_ARCHIVES.'/' . $postid . '_.html', 'string'),
+        'permalink'         => new XML_RPC_Value(serendipity_rewriteURL(PATH_ARCHIVES.'/' . $postid . '_.html', 'baseURL'), 'string'),
+        'link'              => new XML_RPC_Value(serendipity_rewriteURL(PATH_ARCHIVES.'/' . $postid . '_.html', 'baseURL'), 'string'),
     );
 
     return array_merge($entry, $tmp);
@@ -499,4 +499,4 @@
     ob_end_flush();
 }
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.419.2.51
retrieving revision 1.419.2.52
diff -u -d -r1.419.2.51 -r1.419.2.52
--- serendipity_functions.inc.php	16 Oct 2004 09:12:15 -0000	1.419.2.51
+++ serendipity_functions.inc.php	16 Oct 2004 17:27:12 -0000	1.419.2.52
@@ -371,6 +371,11 @@
         $serendipity['fetchLimit'] = $limit;
     }
 
+    /* Attempt to grab range from $serendipity, if $range is not an array or null */
+    if ( !is_array($range) && !is_null($range) && isset($serendipity['range']) ) {
+        $range = $serendipity['range'];
+    }
+
     if (is_numeric($range)) {
         $year = (int)substr($range, 0, 4);
         $month = (int)substr($range, 4, 2);
@@ -390,13 +395,11 @@
         if ($drafts) {
             $cond['and'] .= " AND $drafts";
         }
-    }
-    elseif (is_array($range) && count($range)==2) {
+    } elseif (is_array($range) && count($range)==2) {
         $startts = (int)$range[0];
         $endts   = (int)$range[1];
         $cond['and'] = " WHERE timestamp >= $startts AND timestamp <= $endts";
-    }
-     else {
+    } else {
         if ($modified_since) {
             $unix_modified = strtotime($modified_since);
             if ($unix_modified != -1) {
@@ -1420,7 +1423,7 @@
                       $title,
                       $poster,
                       $entryURI,
-                      $serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'unsubscribe/' . urlencode($subscriber['email']) . '/' . (int)$entry_id
+                      serendipity_rewriteURL('unsubscribe/' . urlencode($subscriber['email']) . '/' . (int)$entry_id, 'baseURL')
             );
         } else {
             $text = sprintf(
@@ -1431,7 +1434,7 @@
                       $title,
                       $poster,
                       $entryURI,
-                      $serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'unsubscribe/' . urlencode($subscriber['email']) . '/' . (int)$entry_id
+                      serendipity_rewriteURL('unsubscribe/' . urlencode($subscriber['email']) . '/' . (int)$entry_id, 'baseURL')
             );
         }
 
@@ -1459,8 +1462,8 @@
 
     $entryURI = serendipity_archiveURL($id, $title, 'baseURL');
     $path = ($type == 'TRACKBACK') ? 'trackback' : 'comment';
-    $deleteURI = $serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_DELETE . '/'. $path .'/' . $comment_id . '/'. $id .'_' . serendipity_makeFilename($title)  . '.html';
-    $approveURI = $serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_APPROVE . '/'. $path .'/' . $comment_id . '/'. $id .'_' . serendipity_makeFilename($title)  . '.html';
+    $deleteURI = serendipity_rewriteURL(PATH_DELETE . '/'. $path .'/' . $comment_id . '/'. $id .'_' . serendipity_makeFilename($title)  . '.html', 'baseURL');
+    $approveURI = serenidpity_rewriteURL(PATH_APPROVE . '/'. $path .'/' . $comment_id . '/'. $id .'_' . serendipity_makeFilename($title)  . '.html', 'baseURL');
 
     if ($type == 'TRACKBACK') {
 
@@ -2036,22 +2039,23 @@
 FAILURE;
 }
 
-/**
- * return a fully qualified URL
- */
-function serendipity_archiveURL($id, $title, $key = 'baseURL', $checkrewrite = true) {
-global $serendipity;
 
-    return $serendipity[$key] . ($checkrewrite && $serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_ARCHIVES . '/' . (int)$id . '-' . serendipity_makeFilename($title) . '.html';
+/* Uses logic to figure out how the URI should look, based on current rewrite rule */
+function serendipity_rewriteURL($path, $key='baseURL') {
+    global $serendipity;
+    return $serendipity[$key] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . $path;
 }
 
-/**
- * return URL for a date archive
- */
-function serendipity_archiveDateUrl($range, $short=false, $key='baseURL') {
-    global $serendipity;
+function serendipity_archiveURL($id, $title, $key = 'baseURL', $checkrewrite = true) {
+    $path = PATH_ARCHIVES . '/' . (int)$id . '-' . serendipity_makeFilename($title) . '.html';
+    if ( $checkrewrite ) {
+        $path = serendipity_rewriteURL($path, $key);
+    }
+    return $path;
+}
 
-    return $serendipity[$key]. ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_ARCHIVES . '/' . $range . ($short ? '-short' : '') . '.html';
+function serendipity_archiveDateUrl($range, $summary=false, $key='baseURL') {
+    return serendipity_rewriteURL(PATH_ARCHIVES . '/' . $range . ($summary ? '/summary' : '') . '.html', $key);
 }
 
 /**
@@ -2614,14 +2618,14 @@
                           ($serendipity['XHTML11'] ? 'style="display: inline; border: 0px"' : 'border="0"'),
                           $xmlImg,
                           str_repeat('&nbsp;', $level * 3),
-                          $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_CATEGORIES . '/' . $cat['categoryid'] . '-' . $category_id,
+                          serendipity_rewriteURL(PATH_CATEGORIES . '/' . $cat['categoryid'] . '-' . $category_id, 'serendipityHTTPPath'),
                           htmlspecialchars($cat['category_description']),
                           htmlspecialchars($cat['category_name']));
                     } else {
                         $ret .= sprintf(
                           '%s<a href="%s" title="%s">%s</a><br />',
                           str_repeat('&nbsp;', $level * 3),
-                          $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_CATEGORIES . '/' . $cat['categoryid'] . '-' . $category_id,
+                          serendipity_rewriteURL(PATH_CATEGORIES . '/' . $cat['categoryid'] . '-' . $category_id, 'serendipityHTTPPath'),
                           htmlspecialchars($cat['category_description']),
                           htmlspecialchars($cat['category_name']));
                     }
@@ -3370,8 +3374,8 @@
 
             $data = array();
             $data['entry_count']    = $entry_count;
-            $data['link']           = serendipity_archiveDateUrl($y . sprintf('%02s', $m));
-            $data['link_summary']   = serendipity_archiveDateUrl($y . sprintf('%02s', $m), true);
+            $data['link']           = serendipity_archiveDateUrl($y . '/'. sprintf('%02s', $m));
+            $data['link_summary']   = serendipity_archiveDateUrl($y . '/'. sprintf('%02s', $m), true);
             $data['date']           = $s;
             $output[$y]['months'][] = $data;
         }
@@ -3395,22 +3399,29 @@
     }
 }
 
-function serendipity_discover_rss($name, $ext, $default = '2.0') {
-    if ($name == 'atom') {
+function serendipity_discover_rss($name, $ext) {
+    static $default = '2.0';
+
+
+    /* Detect type */
+    if ( $name == 'comments' ) {
+        $type = 'comments';
+    } else {
+        $type = 'content';
+    }
+
+    /* Detect version */
+    if ( $name == 'atom' || $ext == 'atom' ) {
         $ver = 'atom0.3';
+    } elseif ( $ext == 'rss' ) {
+        $ver = '0.91';
+    } elseif ( $ext == 'rss1' ) {
+        $ver = '1.0';
     } else {
-        switch ($ext) {
-        case 'rss':
-            $ver = '0.91';
-            break;
-        case 'rss2':
-        default:
-            $ver = $default;
-            break;
-        }
+        $ver = $default;
     }
 
-    return $ver;
+    return array($ver, $type);
 }
 
 function serendipity_load_configuration($author = null) {

Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.49.2.6
retrieving revision 1.49.2.7
diff -u -d -r1.49.2.6 -r1.49.2.7
--- index.php	16 Oct 2004 09:12:15 -0000	1.49.2.6
+++ index.php	16 Oct 2004 17:27:11 -0000	1.49.2.7
@@ -52,46 +52,50 @@
 
 
 if (preg_match(PAT_ARCHIVES, $uri, $matches) || isset($serendipity['GET']['range']) && is_numeric($serendipity['GET']['range'])) {
-    if (!empty($serendipity['GET']['range'])) {
-        $range                         = $serendipity['GET']['range'];
-    } else {
-        $range                         = $matches[1];
-    }
-    $_GET['serendipity']['action']     = 'read';
-    $_GET['serendipity']['range']      = $range;
 
-    if (strlen($range) == 6) {
-        $date = serendipity_formatTime('%B %Y', mktime(0, 0, 0, substr($range, 4, 6), 2, substr($range, 0, 4)));
-    } else {
-        $date = serendipity_formatTime(DATE_FORMAT_ENTRY, strtotime($range));
-    }
+    preg_match_all('@/([a-z0-9]+)@i', $matches[1], $args);
 
-    $serendipity['smarty']->assign('head_subtitle', sprintf(ENTRIES_FOR, $date));
+    /* Attempt to locate hidden variables within the URI */
+    foreach ($args[1] as $k => $v){
+        if ( $v{0} == 'C' ) { /* category */
+            $serendipity['GET']['category'] = substr($v, 1);
+            unset($args[1][$k]);
 
-    ob_start();
-    include_once(S9Y_INCLUDE_PATH . 'serendipity_genpage.inc.php');
-    $data = ob_get_contents();
-    ob_end_clean();
+        } elseif ( $v{0} == 'W' ) { /* Week */
+            $week = substr($v, 1);
+            unset($args[1][$k]);
 
-    if (isset($serendipity['pregenerate']) && $serendipity['pregenerate']) {
-        $fp = fopen('./'.PATH_ARCHIVES.'/' . $matches[1], 'w');
-        fwrite($fp, $data);
-        fclose($fp);
+        } elseif ( $v == 'summary' ) { /* Summary */
+            $serendipity['short_archives'] = true;
+            unset($args[1][$k]);
+        }
     }
 
-    echo $data;
-} else if (preg_match(PAT_ARCHIVES_SHORT, $uri, $matches)) {
-    $range = $matches[1];
-    $_GET['serendipity']['action'] = 'read';
-    $_GET['serendipity']['range']  = $range;
-    $serendipity['short_archives'] = true;
+    /* We must always *assume* that Year, Month and Day are the first 3 arguments */
+    list($year, $month, $day)    = $args[1];
 
-    if (strlen($range) == 6) {
-        $date = date('m/Y', mktime(0,0,0, substr($range, 4, 6), 2, substr($range, 0, 4)));
+    $_GET['serendipity']['action']     = 'read';
+    $_GET['serendipity']['hidefooter'] = true;
+
+    if ( $week ) {
+        $tm = strtotime('+ '. ($week-2) .' WEEKS monday', mktime(0,0,0,1,1,$year));
+        $ts = mktime(0, 0, 0, date('m', $tm), date('j', $tm), $year);
+        $te = mktime(23, 59, 59, date('m', $tm), date('j', $tm)+7, $year);
+        $date = serendipity_formatTime(WEEK .' '. $week .', %Y', $ts);
     } else {
-        $date = date('d/m/Y', strtotime($range));
+        if ( $day ) {
+            $ts = mktime(0, 0, 0, $month, $day, $year);
+            $te = mktime(23, 59, 59, $month, $day, $year);
+            $date = serendipity_formatTime(DATE_FORMAT_ENTRY, $ts);
+        } else {
+            $ts = mktime(0, 0, 0, $month, 1, $year);
+            $te = mktime(23, 59, 59, $month, date('t', $ts), $year);
+            $date = serendipity_formatTime('%B %Y', $ts);
+        }
     }
 
+    $serendipity['range'] = array($ts, $te);
+
     $serendipity['smarty']->assign('head_subtitle', sprintf(ENTRIES_FOR, $date));
 
     ob_start();
@@ -100,7 +104,7 @@
     ob_end_clean();
 
     if (isset($serendipity['pregenerate']) && $serendipity['pregenerate']) {
-        $fp = fopen('./archives/' . $matches[1], 'w');
+        $fp = fopen('./'.PATH_ARCHIVES.'/' . $matches[1], 'w');
         fwrite($fp, $data);
         fclose($fp);
     }
@@ -150,32 +154,28 @@
     ob_end_clean();
 
     if (isset($serendipity['pregenerate']) && $serendipity['pregenerate']) {
-        $fp = fopen('./'.PATH_ARCHIVES.'/' . $matches[1], 'w');
+        $fp = fopen($serendipity['serendipityPath'] . PATH_ARCHIVES.'/' . $id, 'w');
         fwrite($fp, $data);
         fclose($fp);
     }
     print $data;
-} else if (preg_match(PAT_FEEDS, $uri)) {
+} elseif (preg_match(PAT_FEEDS, $uri) && preg_match('@/(index|atom|rss|comments|opml)\.(rss[0-9]?|rdf|rss|xml|atom)$@', $uri, $matches)) {
     header('Content-Type: text/html; charset=utf-8');
-    if (preg_match('@/(index|atom|rss|b2rss|b2rdf).(rss|rdf|rss2|xml)$@', $uri, $matches)) {
-        $_GET['version'] = serendipity_discover_rss($matches[1], $matches[2]);
-
-        ob_start();
-        include_once(S9Y_INCLUDE_PATH . 'rss.php');
-        $data = ob_get_contents();
-        ob_end_clean();
-
-        $data = ltrim($data);
+    list($_GET['version'], $_GET['type']) = serendipity_discover_rss($matches[1], $matches[2]);
 
-        if ($serendipity['pregenerate']) {
-            $fp = fopen('./'.PATH_FEEDS.'/index.' . $matches[1], 'w');
-            fwrite($fp, $data);
-            fclose($fp);
-        }
+    ob_start();
+    include_once(S9Y_INCLUDE_PATH . 'rss.php');
+    $data = ob_get_contents();
+    ob_end_clean();
 
-        print $data;
-        exit;
+    if ($serendipity['pregenerate']) {
+        $fp = fopen($serendipity['serendipityPath'] . PATH_FEEDS.'/index.' . $matches[1], 'w');
+        fwrite($fp, $data);
+        fclose($fp);
     }
+
+    print $data;
+    exit;
 } else if (preg_match(PAT_ADMIN, $uri)) {
     header("Location: {$serendipity['serendipityHTTPPath']}serendipity_admin.php");
     exit;
@@ -202,7 +202,7 @@
         $data = ob_get_contents();
         ob_end_clean();
         if (isset($serendipity['pregenerate']) && $serendipity['pregenerate']) {
-            $fp = fopen('./index.html', 'w');
+            $fp = fopen($serendipity['serendipityPath'] . 'index.html', 'w');
             fwrite($fp, $data);
             fclose($fp);
         }

Index: rss.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/rss.php,v
retrieving revision 1.28.2.2
retrieving revision 1.28.2.3
diff -u -d -r1.28.2.2 -r1.28.2.3
--- rss.php	11 Oct 2004 09:21:06 -0000	1.28.2.2
+++ rss.php	16 Oct 2004 17:27:12 -0000	1.28.2.3
@@ -3,13 +3,12 @@
 
 include_once('serendipity_config.inc.php');
 $version = strtolower($_GET['version']);
-if (empty($version)) {
-    $version = serendipity_discover_rss($_GET['file'], $_GET['ext']);
-}
 
 $description     = $serendipity['blogDescription'];
 $title           = $serendipity['blogTitle'];
 $comments        = FALSE;
+
+
 if (isset($_GET['category'])) {
     $serendipity['GET']['category'] = $_GET['category'];
 }

[php-blog-cvs] serendipity/templates/default smarty_layout.php,1.1.2.3,1.1.2.4

[Tom S. <tom...@us...>]

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

Modified Files:
      Tag: branch-smarty
	smarty_layout.php 
Log Message:
Extended path rewrite:
- Use diffirent URI for browsing months
- Allow the browsing of weeks
- Call "-short" "/summary"
- Use rewritten links in syndication plugin
- Allow access to rss1.0 feeds through rewritten URLs
- Allow access to comment feeds by doing /feeds/comments.(rss|atom|rss1|rss2)
- Add the ability to show months, weeks or days in the archive plugin sidebar
- Add the ability to define how many months, weeks or days that should be displayed in the archive plugin sidebar
- Implement serendipity_rewriteURL() to handle all the rewrite path logic, makes the code MUCH cleaner


TODO: Needs version bump, but I want to have it tested before we do so
TODO: The [RSS] buttons for the category listing still uses the old rss.php syntax, need to figure out how to solve that


Index: smarty_layout.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/smarty_layout.php,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- smarty_layout.php	19 Sep 2004 00:31:25 -0000	1.1.2.3
+++ smarty_layout.php	16 Oct 2004 17:27:15 -0000	1.1.2.4
@@ -4,18 +4,13 @@
 include_once(S9Y_INCLUDE_PATH . 'serendipity_plugin_api.php');
 include_once(S9Y_INCLUDE_PATH . 'serendipity_sidebar_items.php');
 
-if (!isset($serendipity['GET']['range']) || !is_numeric($serendipity['GET']['range'])) {
-    $serendipity['GET']['range'] = date('Ymd');
-}
-
-// The main area
 switch ($serendipity['GET']['action']) {
     // User wants to read the diary
     case 'read':
         if (isset($serendipity['GET']['id'])) {
             serendipity_printEntries(array(serendipity_fetchEntry('id', $serendipity['GET']['id'])), 1);
         } else {
-            serendipity_printEntries(serendipity_fetchEntries($serendipity['GET']['range'], true, 15));
+            serendipity_printEntries(serendipity_fetchEntries($serendipity['range'], true, 15));
         }
         break;
 

[php-blog-cvs] serendipity NEWS,1.214.2.34,1.214.2.35 comment.php,1.44.2.5,1.44.2.6 exit.php,1.6,1.6.2.1 index.php,1.49.2.5,1.49.2.6 serendipity_functions.inc.php,1.419.2.50,1.419.2.51

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

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

Modified Files:
      Tag: branch-smarty
	NEWS comment.php exit.php index.php 
	serendipity_functions.inc.php 
Log Message:
MFH for this lazy jannis-guy :)


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.214.2.34
retrieving revision 1.214.2.35
diff -u -d -r1.214.2.34 -r1.214.2.35
--- NEWS	13 Oct 2004 10:45:57 -0000	1.214.2.34
+++ NEWS	16 Oct 2004 09:12:15 -0000	1.214.2.35
@@ -35,12 +35,18 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Fixed possible HTTP Response Splitting security issue. Thanks to
+      ChaoticEvil for reporting! (jannis, garvinhicking)
+
+Version 0.7-beta4 (October 14th, 2004)
+------------------------------------------------------------------------
+
     * Bug #1016342 - Fixed RSS UTF8 decoding for remote RSS plugin.
       (garvinhicking)
-          
+
     * Fixed some wrong calculations in the statistics plugin, thanks
       to David DeLauro! (garvinhicking)
-          
+
     * Fixed entry count and category association bugs using SQLite
       (garvinhicking)
 
@@ -124,6 +130,9 @@
 Version 0.7-beta2 (September 15th, 2004)
 ------------------------------------------------------------------------
 
+    * Fixed entries pagination for special cases where quickump calendar
+      was displayed on the left sidebar (garvinhicking)
+
     * Added Italian translations, thanks to Alessandro Pellizzari
 
     * Fixed missing CSS-class for BBCode Event-Plugin (Jez Hancock)

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.419.2.50
retrieving revision 1.419.2.51
diff -u -d -r1.419.2.50 -r1.419.2.51
--- serendipity_functions.inc.php	13 Oct 2004 09:31:16 -0000	1.419.2.50
+++ serendipity_functions.inc.php	16 Oct 2004 09:12:15 -0000	1.419.2.51
@@ -1111,7 +1111,9 @@
 
         $query = "UPDATE {$serendipity['dbPrefix']}entries SET allow_comments = '" . ($switch == 'disable' ? 'false' : 'true') . "' WHERE id = '". (int)$entry_id ."' $admin";
         serendipity_db_query($query);
-        header('Location: '. $_SERVER['HTTP_REFERER']);
+        if (serendipity_isResponseClean($_SERVER['HTTP_REFERER'])) {
+            header('Location: '. $_SERVER['HTTP_REFERER']);
+        }
     } else {
         die('What are you up to? You need to be an admin to close comments');
     }
@@ -3520,6 +3522,9 @@
     return serendipity_printTrackbacks(serendipity_fetchTrackbacks($params['entry']));
 }
 
+function serendipity_isResponseClean($d) {
+    return (strpos($d, "\r") === false && strpos($d, "\n") === false);
+}
 
 define("serendipity_FUNCTIONS_LOADED", true);
 /* vim: set sts=4 ts=4 expandtab : */

Index: exit.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/exit.php,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -d -r1.6 -r1.6.2.1
--- exit.php	5 Jul 2004 08:25:49 -0000	1.6
+++ exit.php	16 Oct 2004 09:12:15 -0000	1.6.2.1
@@ -23,7 +23,9 @@
     $url = str_replace('&', '&', base64_decode($_GET['url']));
 }
 
-header('Location: ' . $url);
+if (serendipity_isResponseClean($url)) {
+    header('Location: ' . $url);
+}
 exit;
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: comment.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/comment.php,v
retrieving revision 1.44.2.5
retrieving revision 1.44.2.6
diff -u -d -r1.44.2.5 -r1.44.2.6
--- comment.php	5 Oct 2004 19:56:30 -0000	1.44.2.5
+++ comment.php	16 Oct 2004 09:12:15 -0000	1.44.2.6
@@ -8,7 +8,9 @@
 
 if (isset($serendipity['GET']['delete'], $serendipity['GET']['entry'], $serendipity['GET']['type'])) {
     serendipity_deleteComment($serendipity['GET']['delete'], $serendipity['GET']['entry'], $serendipity['GET']['type']);
-    header('Location: '. $_SERVER['HTTP_REFERER']); die();
+    if (serendipity_isResponseClean($_SERVER['HTTP_REFERER'])) {
+        header('Location: '. $_SERVER['HTTP_REFERER']);
+    }
 }
 
 if (isset($serendipity['GET']['switch'], $serendipity['GET']['entry'])) {
@@ -163,7 +165,10 @@
         $comment['parent_id'] = $serendipity['POST']['replyTo'];
         if (!empty($comment['comment'])) {
             if (serendipity_saveComment($serendipity['POST']['entry_id'], $comment, 'NORMAL')) {
-                header('Location: ' . $serendipity['baseURL'] . 'comment.php?entry_id=' . $serendipity['POST']['entry_id'] . '&success=true&url=' . urlencode($_SERVER['HTTP_REFERER']));
+                $sc_url = $serendipity['baseURL'] . 'comment.php?entry_id=' . $serendipity['POST']['entry_id'] . '&success=true&url=' . urlencode($_SERVER['HTTP_REFERER']);
+                if (serendipity_isResponseClean($sc_url)) {
+                    header('Location: ' . $sc_url);
+                }
                 exit;
             } else {
                 echo $html_header;

Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.49.2.5
retrieving revision 1.49.2.6
diff -u -d -r1.49.2.5 -r1.49.2.6
--- index.php	30 Sep 2004 18:05:44 -0000	1.49.2.5
+++ index.php	16 Oct 2004 09:12:15 -0000	1.49.2.6
@@ -118,7 +118,10 @@
         $comment['parent_id'] = $serendipity['POST']['replyTo'];
         if (!empty($comment['comment'])) {
             if (serendipity_saveComment($serendipity['POST']['entry_id'], $comment, 'NORMAL')) {
-                header('Location: ' . $_SERVER['REQUEST_URI'] . (strstr($_SERVER['REQUEST_URI'], '?') ? '&' : '?') . 'serendipity[csuccess]=' . $serendipity['csuccess']);
+                $sc_url = $_SERVER['REQUEST_URI'] . (strstr($_SERVER['REQUEST_URI'], '?') ? '&' : '?') . 'serendipity[csuccess]=' . $serendipity['csuccess'];
+                if (serendipity_isResponseClean($sc_url)) {
+                    header('Location: ' . $sc_url);
+                }
                 exit;
             } else {
                 $serendipity['messagestack']['comments'][] = COMMENT_NOT_ADDED;

[php-blog-cvs] serendipity NEWS,1.242,1.243 comment.php,1.50,1.51 index.php,1.51,1.52 serendipity_functions.inc.php,1.443,1.444

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

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

Modified Files:
	NEWS comment.php index.php serendipity_functions.inc.php 
Log Message:
more response splitting fixes


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -d -r1.242 -r1.243
--- NEWS	13 Oct 2004 10:44:38 -0000	1.242
+++ NEWS	16 Oct 2004 09:09:46 -0000	1.243
@@ -3,6 +3,12 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Fixed possible HTTP Response Splitting security issue. Thanks to
+      ChaoticEvil for reporting! (jannis, garvinhicking)
+
+Version 0.7-beta4 (October 14th, 2004)
+------------------------------------------------------------------------
+
     * Bug #1016342 - Fixed RSS UTF8 decoding for remote RSS plugin.
       (garvinhicking)
 

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.443
retrieving revision 1.444
diff -u -d -r1.443 -r1.444
--- serendipity_functions.inc.php	15 Oct 2004 14:22:28 -0000	1.443
+++ serendipity_functions.inc.php	16 Oct 2004 09:09:46 -0000	1.444
@@ -1501,8 +1501,9 @@
 
         $query = "UPDATE {$serendipity['dbPrefix']}entries SET allow_comments = '" . ($switch == 'disable' ? 'false' : 'true') . "' WHERE id = '". (int)$entry_id ."' $admin";
         serendipity_db_query($query);
-        if (serendipity_isResponseClean($_SERVER['HTTP_REFERER']))         
+        if (serendipity_isResponseClean($_SERVER['HTTP_REFERER'])) {
             header('Location: '. $_SERVER['HTTP_REFERER']);
+        }
     } else {
         die('What are you up to? You need to be an admin to close comments');
     }

Index: comment.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/comment.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- comment.php	15 Oct 2004 14:22:28 -0000	1.50
+++ comment.php	16 Oct 2004 09:09:46 -0000	1.51
@@ -8,8 +8,9 @@
 
 if (isset($serendipity['GET']['delete'], $serendipity['GET']['entry'], $serendipity['GET']['type'])) {
     serendipity_deleteComment($serendipity['GET']['delete'], $serendipity['GET']['entry'], $serendipity['GET']['type']);
-    if (serendipity_isResponseClean($_SERVER['HTTP_REFERER'])) 
+    if (serendipity_isResponseClean($_SERVER['HTTP_REFERER'])) {
         header('Location: '. $_SERVER['HTTP_REFERER']);
+    }
     die();
 }
 
@@ -167,7 +168,10 @@
         $comment['parent_id'] = $serendipity['POST']['replyTo'];
         if (!empty($comment['comment'])) {
             if (serendipity_saveComment($serendipity['POST']['entry_id'], $comment, 'NORMAL')) {
-                header('Location: ' . $serendipity['baseURL'] . 'comment.php?entry_id=' . $serendipity['POST']['entry_id'] . '&success=true&url=' . urlencode($_SERVER['HTTP_REFERER']));
+                $sc_url = $serendipity['baseURL'] . 'comment.php?entry_id=' . $serendipity['POST']['entry_id'] . '&success=true&url=' . urlencode($_SERVER['HTTP_REFERER']);
+                if (serendipity_isResponseClean($sc_url)) {
+                    header('Location: ' . $sc_url);
+                }
                 exit;
             } else {
                 echo $html_header;

Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- index.php	27 Sep 2004 12:14:38 -0000	1.51
+++ index.php	16 Oct 2004 09:09:46 -0000	1.52
@@ -104,7 +104,10 @@
         $comment['parent_id'] = $serendipity['POST']['replyTo'];
         if (!empty($comment['comment'])) {
             if (serendipity_saveComment($serendipity['POST']['entry_id'], $comment, 'NORMAL')) {
-                header('Location: ' . $_SERVER['REQUEST_URI'] . (strstr($_SERVER['REQUEST_URI'], '?') ? '&' : '?') . 'serendipity[csuccess]=' . $serendipity['csuccess']);
+                $sc_url = $_SERVER['REQUEST_URI'] . (strstr($_SERVER['REQUEST_URI'], '?') ? '&' : '?') . 'serendipity[csuccess]=' . $serendipity['csuccess'];
+                if (serendipity_isResponseClean($sc_url)) {
+                    header('Location: ' . $sc_url);
+                }
                 exit;
             } else {
                 $serendipity['messagestack']['comments'][] = COMMENT_NOT_ADDED;

[php-blog-cvs] serendipity comment.php,1.49,1.50 exit.php,1.10,1.11 serendipity_functions.inc.php,1.442,1.443

[Jannis H. <jhe...@us...>]

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

Modified Files:
	comment.php exit.php serendipity_functions.inc.php 
Log Message:
Cleaner...


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.442
retrieving revision 1.443
diff -u -d -r1.442 -r1.443
--- serendipity_functions.inc.php	15 Oct 2004 13:02:59 -0000	1.442
+++ serendipity_functions.inc.php	15 Oct 2004 14:22:28 -0000	1.443
@@ -1501,7 +1501,7 @@
 
         $query = "UPDATE {$serendipity['dbPrefix']}entries SET allow_comments = '" . ($switch == 'disable' ? 'false' : 'true') . "' WHERE id = '". (int)$entry_id ."' $admin";
         serendipity_db_query($query);
-        if (strpos($_SERVER['HTTP_REFERER'], "\r") === false && strpos($_SERVER['HTTP_REFERER'], "\n") === false)         
+        if (serendipity_isResponseClean($_SERVER['HTTP_REFERER']))         
             header('Location: '. $_SERVER['HTTP_REFERER']);
     } else {
         die('What are you up to? You need to be an admin to close comments');
@@ -3652,6 +3652,10 @@
     }
 }
 
+function serendipity_isResponseClean($d) {
+    return (strpos($d, "\r") === false && strpos($d, "\n") === false);
+}
+
 define("serendipity_FUNCTIONS_LOADED", true);
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: exit.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/exit.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- exit.php	15 Oct 2004 13:02:59 -0000	1.10
+++ exit.php	15 Oct 2004 14:22:28 -0000	1.11
@@ -22,7 +22,7 @@
     // No entry-link ID was submitted. Possibly a spammer tried to mis-use the script to get into the top-list.
     $url = str_replace('&', '&', base64_decode($_GET['url']));
 }
-if (strpos($url, "\r") === false && strpos($url, "\n") === false) 
+if (serendipity_isResponseClean($url))
     header('Location: ' . $url);
 exit;
 /* vim: set sts=4 ts=4 expandtab : */

Index: comment.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/comment.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- comment.php	15 Oct 2004 13:02:52 -0000	1.49
+++ comment.php	15 Oct 2004 14:22:28 -0000	1.50
@@ -8,8 +8,9 @@
 
 if (isset($serendipity['GET']['delete'], $serendipity['GET']['entry'], $serendipity['GET']['type'])) {
     serendipity_deleteComment($serendipity['GET']['delete'], $serendipity['GET']['entry'], $serendipity['GET']['type']);
-    if (strpos($_SERVER['HTTP_REFERER'], "\r") === false && strpos($_SERVER['HTTP_REFERER'], "\n") === false) 
-    header('Location: '. $_SERVER['HTTP_REFERER']); die();
+    if (serendipity_isResponseClean($_SERVER['HTTP_REFERER'])) 
+        header('Location: '. $_SERVER['HTTP_REFERER']);
+    die();
 }
 
 if (isset($serendipity['GET']['switch'], $serendipity['GET']['entry'])) {

[php-blog-cvs] serendipity comment.php,1.48,1.49 exit.php,1.9,1.10 serendipity_functions.inc.php,1.441,1.442

[Jannis H. <jhe...@us...>]

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

Modified Files:
	comment.php exit.php serendipity_functions.inc.php 
Log Message:
Attempt to make sure s9y is no longer vulnerable to HTTP-Response-Splitting attacks. As HTTP message headers require CLRF (rfcs require it), this should fix the problems. I may be wrong though, so please don't trust me here. Should we pack up a new beta when this is the final fix for the problem?

Read more about this at http://www.packetstormsecurity.org/papers/general/whitepaper_httpresponse.pdf

Thanks to Chaotic Evil for telling us before telling bugtraq ;)


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.441
retrieving revision 1.442
diff -u -d -r1.441 -r1.442
--- serendipity_functions.inc.php	13 Oct 2004 09:24:45 -0000	1.441
+++ serendipity_functions.inc.php	15 Oct 2004 13:02:59 -0000	1.442
@@ -1501,7 +1501,8 @@
 
         $query = "UPDATE {$serendipity['dbPrefix']}entries SET allow_comments = '" . ($switch == 'disable' ? 'false' : 'true') . "' WHERE id = '". (int)$entry_id ."' $admin";
         serendipity_db_query($query);
-        header('Location: '. $_SERVER['HTTP_REFERER']);
+        if (strpos($_SERVER['HTTP_REFERER'], "\r") === false && strpos($_SERVER['HTTP_REFERER'], "\n") === false)         
+            header('Location: '. $_SERVER['HTTP_REFERER']);
     } else {
         die('What are you up to? You need to be an admin to close comments');
     }

Index: exit.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/exit.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- exit.php	13 Sep 2004 20:30:41 -0000	1.9
+++ exit.php	15 Oct 2004 13:02:59 -0000	1.10
@@ -22,8 +22,8 @@
     // No entry-link ID was submitted. Possibly a spammer tried to mis-use the script to get into the top-list.
     $url = str_replace('&', '&', base64_decode($_GET['url']));
 }
-
-header('Location: ' . $url);
+if (strpos($url, "\r") === false && strpos($url, "\n") === false) 
+    header('Location: ' . $url);
 exit;
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: comment.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/comment.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- comment.php	24 Sep 2004 13:02:55 -0000	1.48
+++ comment.php	15 Oct 2004 13:02:52 -0000	1.49
@@ -8,6 +8,7 @@
 
 if (isset($serendipity['GET']['delete'], $serendipity['GET']['entry'], $serendipity['GET']['type'])) {
     serendipity_deleteComment($serendipity['GET']['delete'], $serendipity['GET']['entry'], $serendipity['GET']['type']);
+    if (strpos($_SERVER['HTTP_REFERER'], "\r") === false && strpos($_SERVER['HTTP_REFERER'], "\n") === false) 
     header('Location: '. $_SERVER['HTTP_REFERER']); die();
 }
 

[php-blog-cvs] serendipity serendipity_config.inc.php,1.97,1.98

[Tom S. <tom...@us...>]

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

Modified Files:
	serendipity_config.inc.php 
Log Message:
- Bump version...


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- serendipity_config.inc.php	7 Oct 2004 13:58:58 -0000	1.97
+++ serendipity_config.inc.php	14 Oct 2004 16:25:19 -0000	1.98
@@ -15,7 +15,7 @@
 
 include_once(S9Y_INCLUDE_PATH . 'compat.php');
 
-$serendipity['version']         = '0.7-beta3';
+$serendipity['version']         = '0.7-beta4';
 $serendipity['defaultTemplate'] = 'default'; // Name of folder for the default theme
 $serendipity['production']      = 1;
 $serendipity['rewrite']         = 'none';

[php-blog-cvs] serendipity serendipity_genpage.inc.php,1.34,1.35

[Jannis H. <jhe...@us...>]

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

Modified Files:
	serendipity_genpage.inc.php 
Log Message:
No <style> tag should be printed when the external stylesheet is ''


Index: serendipity_genpage.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_genpage.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- serendipity_genpage.inc.php	30 Sep 2004 13:39:40 -0000	1.34
+++ serendipity_genpage.inc.php	14 Oct 2004 11:41:14 -0000	1.35
@@ -21,7 +21,7 @@
     <link rel="stylesheet" type="text/css" href="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity.css.php" />
     <link rel="alternate"  type="application/rss+xml" title="RSS" href="<?php echo $serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : ''); ?>feeds/index.rss2" />
     <link rel="alternate"  type="application/x.atom+xml"  title="Atom"  href="<?php echo $serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : ''); ?>feeds/atom.xml" />
-<?php if (strtolower($serendipity['extCSS'])!='none') { ?>
+<?php if (strlen($serendipity['extCSS']) > 0 && strtolower($serendipity['extCSS'])!='none') { ?>
     <style type="text/css">@import "<?php echo $serendipity['extCSS']; ?>";</style>
 <?php }
       if (isset($serendipity['GET']['id']) && is_numeric($serendipity['GET']['id'])) { ?>

[php-blog-cvs] serendipity/plugins/serendipity_plugin_remoterss serendipity_plugin_remoterss.php,1.5.2.1,1.5.2.2

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_plugin_remoterss.php 
Log Message:
MFH


Index: serendipity_plugin_remoterss.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_remoterss/serendipity_plugin_remoterss.php,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -d -r1.5.2.1 -r1.5.2.2
--- serendipity_plugin_remoterss.php	20 Sep 2004 14:32:26 -0000	1.5.2.1
+++ serendipity_plugin_remoterss.php	13 Oct 2004 10:45:58 -0000	1.5.2.2
@@ -405,11 +405,11 @@
                         if (empty($item['title'])) {
                             continue;
                         }
-                        $content .= '<a href="' . $item['link'] . '" target="'.$target.'">';
+                        $content .= '<a href="' . $this->rss_utf8_decode($item['link']) . '" target="'.$target.'">';
                         if (!empty($bulletimg)) {
                             $content .= '<img src="' . $bulletimg . '" border="0" alt="*" /> ';
                         }
-                        $content .= $item['title'] . "</a><br />\n";
+                        $content .= $this->rss_utf8_decode($item['title']) . "</a><br />\n";
                         $item['timestamp'] = strtotime(isset($item['pubdate']) ? $item['pubdate'] : $item['dc:date']);
                         if (!($item['timestamp'] == -1) AND ($displaydate == 'true')) {
                             $content .= '<div class="serendipitySideBarDate">'
@@ -446,23 +446,23 @@
                         $content = '';
                         while (($showAll || ($i < $number)) && ($item = $opml->getOPMLOutlineAttr($opmltree, $i))) {
                             if (!empty($item['url'])) {
-                                $url = $item['url'];
+                                $url = $this->rss_utf8_decode($item['url']);
                             } elseif (!empty($item['htmlUrl'])) {
-                                $url = $item['htmlUrl'];
+                                $url = $this->rss_utf8_decode($item['htmlUrl']);
                             } elseif (!empty($item['xmlUrl'])) {
-                                $url = $item['xmlUrl'];
+                                $url = $this->rss_utf8_decode($item['xmlUrl']);
                             } elseif (!empty($item['urlHTTP'])) {
-                                $url = $item['urlHTTP'];
+                                $url = $this->rss_utf8_decode($item['urlHTTP']);
                             } else {
                                 $url = '';
                             }
 
                             if (!empty($item['text'])) {
-                                $text = htmlspecialchars($item['text']);
+                                $text = htmlspecialchars($this->rss_utf8_decode($item['text']));
                             } elseif (!empty($item['title'])) {
-                                $text = htmlspecialchars($item['title']);
+                                $text = htmlspecialchars($this->rss_utf8_decode($item['title']));
                             } elseif (!empty($item['description'])) {
-                                $text = htmlspecialchars($item['description']);
+                                $text = htmlspecialchars($this->rss_utf8_decode($item['description']));
                             } else {
                                 $text = '';
                             }
@@ -510,6 +510,14 @@
            echo PLUGIN_REMOTERSS_NOURI;
         }
     }
+
+    function rss_utf8_decode($string) {
+        if (strtolower(LANG_CHARSET) != 'utf-8') {
+            return utf8_decode($string);
+        } else {
+            return $string;
+        }
+    }
 }
 
 /* vim: set sts=4 ts=4 expandtab : */

[php-blog-cvs] serendipity NEWS,1.214.2.33,1.214.2.34

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

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

Modified Files:
      Tag: branch-smarty
	NEWS 
Log Message:
MFH


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.214.2.33
retrieving revision 1.214.2.34
diff -u -d -r1.214.2.33 -r1.214.2.34
--- NEWS	13 Oct 2004 09:40:16 -0000	1.214.2.33
+++ NEWS	13 Oct 2004 10:45:57 -0000	1.214.2.34
@@ -35,6 +35,9 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Bug #1016342 - Fixed RSS UTF8 decoding for remote RSS plugin.
+      (garvinhicking)
+          
     * Fixed some wrong calculations in the statistics plugin, thanks
       to David DeLauro! (garvinhicking)
           

[php-blog-cvs] serendipity/plugins/serendipity_plugin_remoterss serendipity_plugin_remoterss.php,1.6,1.7

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

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

Modified Files:
	serendipity_plugin_remoterss.php 
Log Message:
    * Bug #1016342 - Fixed RSS UTF8 decoding for remote RSS plugin.
      (garvinhicking)



Index: serendipity_plugin_remoterss.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_remoterss/serendipity_plugin_remoterss.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- serendipity_plugin_remoterss.php	20 Sep 2004 14:32:37 -0000	1.6
+++ serendipity_plugin_remoterss.php	13 Oct 2004 10:44:38 -0000	1.7
@@ -405,11 +405,11 @@
                         if (empty($item['title'])) {
                             continue;
                         }
-                        $content .= '<a href="' . $item['link'] . '" target="'.$target.'">';
+                        $content .= '<a href="' . $this->rss_utf8_decode($item['link']) . '" target="'.$target.'">';
                         if (!empty($bulletimg)) {
                             $content .= '<img src="' . $bulletimg . '" border="0" alt="*" /> ';
                         }
-                        $content .= $item['title'] . "</a><br />\n";
+                        $content .= $this->rss_utf8_decode($item['title']) . "</a><br />\n";
                         $item['timestamp'] = strtotime(isset($item['pubdate']) ? $item['pubdate'] : $item['dc:date']);
                         if (!($item['timestamp'] == -1) AND ($displaydate == 'true')) {
                             $content .= '<div class="serendipitySideBarDate">'
@@ -446,23 +446,23 @@
                         $content = '';
                         while (($showAll || ($i < $number)) && ($item = $opml->getOPMLOutlineAttr($opmltree, $i))) {
                             if (!empty($item['url'])) {
-                                $url = $item['url'];
+                                $url = $this->rss_utf8_decode($item['url']);
                             } elseif (!empty($item['htmlUrl'])) {
-                                $url = $item['htmlUrl'];
+                                $url = $this->rss_utf8_decode($item['htmlUrl']);
                             } elseif (!empty($item['xmlUrl'])) {
-                                $url = $item['xmlUrl'];
+                                $url = $this->rss_utf8_decode($item['xmlUrl']);
                             } elseif (!empty($item['urlHTTP'])) {
-                                $url = $item['urlHTTP'];
+                                $url = $this->rss_utf8_decode($item['urlHTTP']);
                             } else {
                                 $url = '';
                             }
 
                             if (!empty($item['text'])) {
-                                $text = htmlspecialchars($item['text']);
+                                $text = htmlspecialchars($this->rss_utf8_decode($item['text']));
                             } elseif (!empty($item['title'])) {
-                                $text = htmlspecialchars($item['title']);
+                                $text = htmlspecialchars($this->rss_utf8_decode($item['title']));
                             } elseif (!empty($item['description'])) {
-                                $text = htmlspecialchars($item['description']);
+                                $text = htmlspecialchars($this->rss_utf8_decode($item['description']));
                             } else {
                                 $text = '';
                             }
@@ -510,6 +510,14 @@
            echo PLUGIN_REMOTERSS_NOURI;
         }
     }
+
+    function rss_utf8_decode($string) {
+        if (strtolower(LANG_CHARSET) != 'utf-8') {
+            return utf8_decode($string);
+        } else {
+            return $string;
+        }
+    }
 }
 
 /* vim: set sts=4 ts=4 expandtab : */

[php-blog-cvs] serendipity NEWS,1.241,1.242

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

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

Modified Files:
	NEWS 
Log Message:
    * Bug #1016342 - Fixed RSS UTF8 decoding for remote RSS plugin.
      (garvinhicking)



Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -d -r1.241 -r1.242
--- NEWS	13 Oct 2004 09:38:53 -0000	1.241
+++ NEWS	13 Oct 2004 10:44:38 -0000	1.242
@@ -3,6 +3,9 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Bug #1016342 - Fixed RSS UTF8 decoding for remote RSS plugin.
+      (garvinhicking)
+
     * Fixed some wrong calculations in the statistics plugin, thanks
       to David DeLauro! (garvinhicking)
 

[php-blog-cvs] serendipity/plugins/serendipity_event_karma serendipity_event_karma.php,1.14.2.3,1.14.2.4

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_event_karma.php 
Log Message:
better fix


Index: serendipity_event_karma.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_karma/serendipity_event_karma.php,v
retrieving revision 1.14.2.3
retrieving revision 1.14.2.4
diff -u -d -r1.14.2.3 -r1.14.2.4
--- serendipity_event_karma.php	13 Oct 2004 09:40:16 -0000	1.14.2.3
+++ serendipity_event_karma.php	13 Oct 2004 09:54:46 -0000	1.14.2.4
@@ -410,7 +410,8 @@
                                 JOIN {$serendipity['dbPrefix']}entries
                                      AS e
                                   ON k.entryid = e.id
-                            GROUP BY e.id, e.title, k.{$rows[0]} ORDER BY k.{$rows[0]} {$rows[1]} LIMIT {$addData['maxitems']}";
+                            WHERE k.{$rows[0]} IS NOT NULL
+                            GROUP BY e.id, e.title ORDER BY k.{$rows[0]} {$rows[1]} LIMIT {$addData['maxitems']}";
 
                         $sql_rows = serendipity_db_query($q);
 ?>

[php-blog-cvs] serendipity/plugins/serendipity_event_karma serendipity_event_karma.php,1.17,1.18

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

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

Modified Files:
	serendipity_event_karma.php 
Log Message:
better fix


Index: serendipity_event_karma.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_karma/serendipity_event_karma.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- serendipity_event_karma.php	13 Oct 2004 09:38:54 -0000	1.17
+++ serendipity_event_karma.php	13 Oct 2004 09:54:27 -0000	1.18
@@ -410,7 +410,8 @@
                                 JOIN {$serendipity['dbPrefix']}entries
                                      AS e
                                   ON k.entryid = e.id
-                            GROUP BY e.id, e.title, k.{$rows[0]} ORDER BY k.{$rows[0]} {$rows[1]} LIMIT {$addData['maxitems']}";
+                            WHERE k.{$rows[0]} IS NOT NULL
+                            GROUP BY e.id, e.title ORDER BY k.{$rows[0]} {$rows[1]} LIMIT {$addData['maxitems']}";
 
                         $sql_rows = serendipity_db_query($q);
 ?>

[php-blog-cvs] serendipity/plugins/serendipity_event_statistics serendipity_event_statistics.php,1.11,1.11.2.1

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_event_statistics.php 
Log Message:
MFH


Index: serendipity_event_statistics.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_statistics/serendipity_event_statistics.php,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -d -r1.11 -r1.11.2.1
--- serendipity_event_statistics.php	29 Jun 2004 07:58:59 -0000	1.11
+++ serendipity_event_statistics.php	13 Oct 2004 09:40:17 -0000	1.11.2.1
@@ -179,7 +179,7 @@
                                                          {$serendipity['dbPrefix']}category c,
                                                          {$serendipity['dbPrefix']}entries e
                                                     WHERE ec.categoryid = c.categoryid AND ec.entryid = e.id
-                                                    GROUP BY ec.categoryid
+                                                    GROUP BY ec.categoryid, c.category_name
                                                     ORDER BY postings DESC";
                     $category_rows  = serendipity_db_query($cat_sql);
 
@@ -191,7 +191,7 @@
                                                     FROM {$serendipity['dbPrefix']}comments c,
                                                          {$serendipity['dbPrefix']}entries e
                                                     WHERE e.id = c.entry_id AND type = 'NORMAL' AND subscribed = 'true'
-                                                    GROUP BY e.id, c.email
+                                                    GROUP BY e.id, c.email, e.title
                                                     ORDER BY postings DESC
                                                     LIMIT $max_items");
 
@@ -200,14 +200,14 @@
                                                     FROM {$serendipity['dbPrefix']}comments c,
                                                          {$serendipity['dbPrefix']}entries e
                                                     WHERE e.id = c.entry_id AND type = 'NORMAL'
-                                                    GROUP BY e.id
+                                                    GROUP BY e.id, e.title
                                                     ORDER BY postings DESC
                                                     LIMIT $max_items");
 
                     $commentor_rows = serendipity_db_query("SELECT author, email, url, count(id) as postings
                                                     FROM {$serendipity['dbPrefix']}comments c
                                                     WHERE type = 'NORMAL'
-                                                    GROUP BY author
+                                                    GROUP BY author, email, url
                                                     ORDER BY postings DESC
                                                     LIMIT $max_items");
 
@@ -216,14 +216,14 @@
                                                     FROM {$serendipity['dbPrefix']}comments c,
                                                          {$serendipity['dbPrefix']}entries e
                                                     WHERE e.id = c.entry_id AND type = 'TRACKBACK'
-                                                    GROUP BY e.id
+                                                    GROUP BY e.id, e.title
                                                     ORDER BY postings DESC
                                                     LIMIT $max_items");
 
                     $tbr_rows = serendipity_db_query("SELECT author, email, url, count(id) as postings
                                                     FROM {$serendipity['dbPrefix']}comments c
                                                     WHERE type = 'TRACKBACK'
-                                                    GROUP BY author
+                                                    GROUP BY author, email, url
                                                     ORDER BY postings DESC
                                                     LIMIT $max_items");
 

[php-blog-cvs] serendipity/plugins/serendipity_event_karma serendipity_event_karma.php,1.14.2.2,1.14.2.3

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_event_karma.php 
Log Message:
MFH


Index: serendipity_event_karma.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_karma/serendipity_event_karma.php,v
retrieving revision 1.14.2.2
retrieving revision 1.14.2.3
diff -u -d -r1.14.2.2 -r1.14.2.3
--- serendipity_event_karma.php	25 Sep 2004 11:08:05 -0000	1.14.2.2
+++ serendipity_event_karma.php	13 Oct 2004 09:40:16 -0000	1.14.2.3
@@ -410,7 +410,7 @@
                                 JOIN {$serendipity['dbPrefix']}entries
                                      AS e
                                   ON k.entryid = e.id
-                            GROUP BY e.id ORDER BY k.{$rows[0]} {$rows[1]} LIMIT {$addData['maxitems']}";
+                            GROUP BY e.id, e.title, k.{$rows[0]} ORDER BY k.{$rows[0]} {$rows[1]} LIMIT {$addData['maxitems']}";
 
                         $sql_rows = serendipity_db_query($q);
 ?>

[php-blog-cvs] serendipity NEWS,1.214.2.32,1.214.2.33

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

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

Modified Files:
      Tag: branch-smarty
	NEWS 
Log Message:
MFH


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.214.2.32
retrieving revision 1.214.2.33
diff -u -d -r1.214.2.32 -r1.214.2.33
--- NEWS	13 Oct 2004 09:31:15 -0000	1.214.2.32
+++ NEWS	13 Oct 2004 09:40:16 -0000	1.214.2.33
@@ -35,6 +35,9 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Fixed some wrong calculations in the statistics plugin, thanks
+      to David DeLauro! (garvinhicking)
+          
     * Fixed entry count and category association bugs using SQLite
       (garvinhicking)
 

[php-blog-cvs] serendipity NEWS,1.240,1.241

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

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

Modified Files:
	NEWS 
Log Message:
    * Fixed some wrong calculations in the statistics plugin, thanks
      to David DeLauro! (garvinhicking)



Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -d -r1.240 -r1.241
--- NEWS	13 Oct 2004 09:25:01 -0000	1.240
+++ NEWS	13 Oct 2004 09:38:53 -0000	1.241
@@ -3,6 +3,9 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Fixed some wrong calculations in the statistics plugin, thanks
+      to David DeLauro! (garvinhicking)
+
     * Fixed entry count and category association bugs using SQLite
       (garvinhicking)
 

[php-blog-cvs] serendipity/plugins/serendipity_event_statistics serendipity_event_statistics.php,1.11,1.12

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

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

Modified Files:
	serendipity_event_statistics.php 
Log Message:
    * Fixed some wrong calculations in the statistics plugin, thanks
      to David DeLauro! (garvinhicking)



Index: serendipity_event_statistics.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_statistics/serendipity_event_statistics.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- serendipity_event_statistics.php	29 Jun 2004 07:58:59 -0000	1.11
+++ serendipity_event_statistics.php	13 Oct 2004 09:38:54 -0000	1.12
@@ -179,7 +179,7 @@
                                                          {$serendipity['dbPrefix']}category c,
                                                          {$serendipity['dbPrefix']}entries e
                                                     WHERE ec.categoryid = c.categoryid AND ec.entryid = e.id
-                                                    GROUP BY ec.categoryid
+                                                    GROUP BY ec.categoryid, c.category_name
                                                     ORDER BY postings DESC";
                     $category_rows  = serendipity_db_query($cat_sql);
 
@@ -191,7 +191,7 @@
                                                     FROM {$serendipity['dbPrefix']}comments c,
                                                          {$serendipity['dbPrefix']}entries e
                                                     WHERE e.id = c.entry_id AND type = 'NORMAL' AND subscribed = 'true'
-                                                    GROUP BY e.id, c.email
+                                                    GROUP BY e.id, c.email, e.title
                                                     ORDER BY postings DESC
                                                     LIMIT $max_items");
 
@@ -200,14 +200,14 @@
                                                     FROM {$serendipity['dbPrefix']}comments c,
                                                          {$serendipity['dbPrefix']}entries e
                                                     WHERE e.id = c.entry_id AND type = 'NORMAL'
-                                                    GROUP BY e.id
+                                                    GROUP BY e.id, e.title
                                                     ORDER BY postings DESC
                                                     LIMIT $max_items");
 
                     $commentor_rows = serendipity_db_query("SELECT author, email, url, count(id) as postings
                                                     FROM {$serendipity['dbPrefix']}comments c
                                                     WHERE type = 'NORMAL'
-                                                    GROUP BY author
+                                                    GROUP BY author, email, url
                                                     ORDER BY postings DESC
                                                     LIMIT $max_items");
 
@@ -216,14 +216,14 @@
                                                     FROM {$serendipity['dbPrefix']}comments c,
                                                          {$serendipity['dbPrefix']}entries e
                                                     WHERE e.id = c.entry_id AND type = 'TRACKBACK'
-                                                    GROUP BY e.id
+                                                    GROUP BY e.id, e.title
                                                     ORDER BY postings DESC
                                                     LIMIT $max_items");
 
                     $tbr_rows = serendipity_db_query("SELECT author, email, url, count(id) as postings
                                                     FROM {$serendipity['dbPrefix']}comments c
                                                     WHERE type = 'TRACKBACK'
-                                                    GROUP BY author
+                                                    GROUP BY author, email, url
                                                     ORDER BY postings DESC
                                                     LIMIT $max_items");
 

[php-blog-cvs] serendipity/plugins/serendipity_event_karma serendipity_event_karma.php,1.16,1.17

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

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

Modified Files:
	serendipity_event_karma.php 
Log Message:
    * Fixed some wrong calculations in the statistics plugin, thanks
      to David DeLauro! (garvinhicking)



Index: serendipity_event_karma.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_karma/serendipity_event_karma.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- serendipity_event_karma.php	25 Sep 2004 11:00:51 -0000	1.16
+++ serendipity_event_karma.php	13 Oct 2004 09:38:54 -0000	1.17
@@ -410,7 +410,7 @@
                                 JOIN {$serendipity['dbPrefix']}entries
                                      AS e
                                   ON k.entryid = e.id
-                            GROUP BY e.id ORDER BY k.{$rows[0]} {$rows[1]} LIMIT {$addData['maxitems']}";
+                            GROUP BY e.id, e.title, k.{$rows[0]} ORDER BY k.{$rows[0]} {$rows[1]} LIMIT {$addData['maxitems']}";
 
                         $sql_rows = serendipity_db_query($q);
 ?>

[php-blog-cvs] serendipity NEWS,1.214.2.31,1.214.2.32 serendipity_db_postgres.inc.php,1.18,1.18.2.1 serendipity_functions.inc.php,1.419.2.49,1.419.2.50

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

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

Modified Files:
      Tag: branch-smarty
	NEWS serendipity_db_postgres.inc.php 
	serendipity_functions.inc.php 
Log Message:
MFH


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.419.2.49
retrieving revision 1.419.2.50
diff -u -d -r1.419.2.49 -r1.419.2.50
--- serendipity_functions.inc.php	12 Oct 2004 21:00:11 -0000	1.419.2.49
+++ serendipity_functions.inc.php	13 Oct 2004 09:31:16 -0000	1.419.2.50
@@ -333,7 +333,7 @@
                          c.category_icon,
                          c.parentid
                     FROM {$serendipity['dbPrefix']}category AS c
-               LEFT JOIN {$serendipity['dbPrefix']}entrycat AS ec
+                    JOIN {$serendipity['dbPrefix']}entrycat AS ec
                       ON ec.categoryid = c.categoryid
                    WHERE ec.entryid = {$entryid}";
 
@@ -901,7 +901,7 @@
 
     // The unique query condition was built previously in serendipity_fetchEntries()
     if (strtolower($serendipity['dbType']) == 'sqlite') {
-        $querystring  = "SELECT count(e.id) {$serendipity['fullCountQuery']} GROUP BY count(e.id)";
+        $querystring  = "SELECT count(e.id) {$serendipity['fullCountQuery']} GROUP BY e.id";
     } else {
         $querystring  = "SELECT count(distinct e.id) {$serendipity['fullCountQuery']}";
     }
@@ -909,7 +909,11 @@
     $query = serendipity_db_query($querystring);
 
     if (is_array($query) && isset($query[0])) {
-        return $query[0][0];
+        if (strtolower($serendipity['dbType']) == 'sqlite') {
+            return count($query);
+        } else {
+            return $query[0][0];
+        }
     }
 
     return 0;

Index: serendipity_db_postgres.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db_postgres.inc.php,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -u -d -r1.18 -r1.18.2.1
--- serendipity_db_postgres.inc.php	9 Sep 2004 10:52:02 -0000	1.18
+++ serendipity_db_postgres.inc.php	13 Oct 2004 09:31:15 -0000	1.18.2.1
@@ -65,7 +65,11 @@
                          'both'  => PGSQL_BOTH
     );
 
-    $serendipity['dbLastResult'] = pg_query($serendipity['dbConn'], $sql);
+    if ($reportErr || !$serendipity['production']) {
+        $serendipity['dbLastResult'] = pg_query($serendipity['dbConn'], $sql);
+    } else {
+        $serendipity['dbLastResult'] = @pg_query($serendipity['dbConn'], $sql);
+    }
 
     if (!$serendipity['dbLastResult']) {
         if (!$serendipity['production']) {

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.214.2.31
retrieving revision 1.214.2.32
diff -u -d -r1.214.2.31 -r1.214.2.32
--- NEWS	11 Oct 2004 22:32:46 -0000	1.214.2.31
+++ NEWS	13 Oct 2004 09:31:15 -0000	1.214.2.32
@@ -35,6 +35,12 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Fixed entry count and category association bugs using SQLite
+      (garvinhicking)
+
+    * Fixed some error notices for installation with postgreSQL regarding
+      field index names (garvinhicking)
+
     * Fixed wrong mod_rewrite rules to properly redirect to pages.
       (garvinhicking)
 

[php-blog-cvs] serendipity/sql db.sql,1.18.2.1,1.18.2.2 db_update_0.5_0.5.1_mysql.sql,1.2,1.2.6.1 db_update_0.5_0.5.1_postgres.sql,1.2,1.2.4.1 db_update_0.6.2_0.6.3_mysql.sql,1.3,1.3.2.1 db_update_0.6.2_0.6.3_postgres.sql,1.4,1.4.2.1 db_update_0.6.5_0.6.6_mysql.sql,1.1,1.1.2.1 db_update_0.6.5_0.6.6_postgres.sql,1.1,1.1.2.1 db_update_0.6_0.6.1_mysql.sql,1.2,1.2.2.1 db_update_0.6_0.6.1_postgres.sql,1.3,1.3.2.1 db_update_0.8-alpha1_0.8-alpha2_mysql.sql,1.1.2.1,1.1.2.2

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

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

Modified Files:
      Tag: branch-smarty
	db.sql db_update_0.5_0.5.1_mysql.sql 
	db_update_0.5_0.5.1_postgres.sql 
	db_update_0.6.2_0.6.3_mysql.sql 
	db_update_0.6.2_0.6.3_postgres.sql 
	db_update_0.6.5_0.6.6_mysql.sql 
	db_update_0.6.5_0.6.6_postgres.sql 
	db_update_0.6_0.6.1_mysql.sql db_update_0.6_0.6.1_postgres.sql 
	db_update_0.8-alpha1_0.8-alpha2_mysql.sql 
Log Message:
MFH


Index: db_update_0.6.5_0.6.6_postgres.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.6.5_0.6.6_postgres.sql,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- db_update_0.6.5_0.6.6_postgres.sql	18 Jun 2004 09:04:40 -0000	1.1
+++ db_update_0.6.5_0.6.6_postgres.sql	13 Oct 2004 09:31:17 -0000	1.1.2.1
@@ -1 +1 @@
-CREATE UNIQUE INDEX entryid ON {PREFIX}entrycat (entryid, categoryid);
\ No newline at end of file
+CREATE UNIQUE INDEX entryid_idx ON {PREFIX}entrycat (entryid, categoryid);
\ No newline at end of file

Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db.sql,v
retrieving revision 1.18.2.1
retrieving revision 1.18.2.2
diff -u -d -r1.18.2.1 -r1.18.2.2
--- db.sql	21 Sep 2004 20:43:16 -0000	1.18.2.1
+++ db.sql	13 Oct 2004 09:31:16 -0000	1.18.2.2
@@ -42,7 +42,7 @@
   status varchar(50) not null
 );
 
-CREATE {FULLTEXT} INDEX body on {PREFIX}comments (body);
+CREATE {FULLTEXT} INDEX body_idx on {PREFIX}comments (body);
 
 #
 # table structure for table '{PREFIX}entries'
@@ -65,7 +65,7 @@
   moderate_comments {BOOLEAN}
 );
 
-CREATE {FULLTEXT} INDEX entry on {PREFIX}entries (title,body,extended);
+CREATE {FULLTEXT} INDEX entry_idx on {PREFIX}entries (title,body,extended);
 CREATE INDEX date_idx ON {PREFIX}entries (timestamp);
 CREATE INDEX mod_idx ON {PREFIX}entries (last_modified);
 
@@ -122,7 +122,7 @@
   authorid int(11) default '0'
 );
 
-CREATE INDEX authorid ON {PREFIX}config (authorid);
+CREATE INDEX authorid_idx ON {PREFIX}config (authorid);
 
 CREATE TABLE {PREFIX}suppress (
   ip varchar(15) default NULL,
@@ -134,7 +134,7 @@
   last timestamp NOT NULL
 );
 
-CREATE unique INDEX url on {PREFIX}suppress (host, ip);
+CREATE unique INDEX url_idx on {PREFIX}suppress (host, ip);
 
 CREATE TABLE {PREFIX}plugins (
   name varchar(128) not null,
@@ -144,7 +144,7 @@
   PRIMARY KEY(name)
 );
 
-CREATE INDEX authorid ON {PREFIX}config (authorid);
+CREATE INDEX authorid_idx ON {PREFIX}config (authorid);
 
 CREATE TABLE {PREFIX}category (
   categoryid {AUTOINCREMENT} {PRIMARY},
@@ -171,14 +171,14 @@
   path text
 );
 
-CREATE {FULLTEXT} INDEX pathkey on {PREFIX}images (path);
+CREATE {FULLTEXT} INDEX pathkey_idx on {PREFIX}images (path);
 
 CREATE TABLE {PREFIX}entrycat (
   entryid int(11) not null,
   categoryid int(11) not null
 );
 
-CREATE UNIQUE INDEX entryid ON {PREFIX}entrycat (entryid, categoryid);
+CREATE UNIQUE INDEX entryid_idx ON {PREFIX}entrycat (entryid, categoryid);
 
 create table {PREFIX}entryproperties (
   entryid int(11) not null,
@@ -186,5 +186,5 @@
   value text
 );
 
-CREATE INDEX entryid ON {PREFIX}entryproperties (entryid);
-CREATE UNIQUE INDEX prop ON {PREFIX}entryproperties (entryid, property);
+CREATE INDEX entryid_idx ON {PREFIX}entryproperties (entryid);
+CREATE UNIQUE INDEX prop_idx ON {PREFIX}entryproperties (entryid, property);

Index: db_update_0.5_0.5.1_postgres.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.5_0.5.1_postgres.sql,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -d -r1.2 -r1.2.4.1
--- db_update_0.5_0.5.1_postgres.sql	11 Apr 2004 04:22:21 -0000	1.2
+++ db_update_0.5_0.5.1_postgres.sql	13 Oct 2004 09:31:17 -0000	1.2.4.1
@@ -17,15 +17,15 @@
 UPDATE {PREFIX}config
    SET name = REPLACE(name, 'serendipity_plugin_content_rewrite', 'serendipity_event_contentrewrite')
  WHERE name LIKE '%serendipity_plugin_content_rewrite%';
- 
+
 UPDATE {PREFIX}plugins
    SET placement = 'event'
  WHERE name LIKE '%serendipity_event_contentrewrite%';
- 
+
 ALTER TABLE {PREFIX}entries ADD COLUMN last_modified INT;
 
-CREATE INDEX timestamp ON {PREFIX}entries (timestamp);
-CREATE INDEX last_modified ON {PREFIX}entries (last_modified);
+CREATE INDEX date_idx ON {PREFIX}entries (timestamp);
+CREATE INDEX mod_idx ON {PREFIX}entries (last_modified);
 UPDATE {PREFIX}entries SET last_modified = timestamp;
 
 INSERT INTO {PREFIX}plugins(name, placement, sort_order) VALUES ('serendipity_event_nl2br:39979424fea674e78399659e67edaf12', 'event', 10);

Index: db_update_0.6.2_0.6.3_mysql.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.6.2_0.6.3_mysql.sql,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- db_update_0.6.2_0.6.3_mysql.sql	26 May 2004 17:02:35 -0000	1.3
+++ db_update_0.6.2_0.6.3_mysql.sql	13 Oct 2004 09:31:17 -0000	1.3.2.1
@@ -1,2 +1,2 @@
 ALTER TABLE {PREFIX}images ADD COLUMN path text;
-CREATE {FULLTEXT} INDEX pathkey on {PREFIX}images (path);
+CREATE {FULLTEXT} INDEX pathkey_idx on {PREFIX}images (path);

Index: db_update_0.6_0.6.1_postgres.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.6_0.6.1_postgres.sql,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- db_update_0.6_0.6.1_postgres.sql	6 Sep 2004 09:15:32 -0000	1.3
+++ db_update_0.6_0.6.1_postgres.sql	13 Oct 2004 09:31:17 -0000	1.3.2.1
@@ -8,15 +8,15 @@
 UPDATE {PREFIX}config SET authorid=0;
 ALTER TABLE {PREFIX}config  ALTER COLUMN authorid SET NOT NULL;
 ALTER TABLE {PREFIX}config  ALTER COLUMN authorid SET DEFAULT '0';
-CREATE INDEX config_authorid ON {PREFIX}config (authorid);
+CREATE INDEX authorid_idx ON {PREFIX}config (authorid);
 
 ALTER TABLE {PREFIX}config  DROP CONSTRAINT {PREFIX}config_pkey;
 ALTER TABLE {PREFIX}config  ADD PRIMARY KEY (name, authorid);
 
 ALTER TABLE {PREFIX}plugins  ADD COLUMN authorid  INT;
 ALTER TABLE {PREFIX}plugins  ALTER COLUMN authorid SET DEFAULT '0';
-CREATE INDEX plugins_authorid ON {PREFIX}plugins (authorid);
+CREATE INDEX authorid_idx ON {PREFIX}plugins (authorid);
 
 ALTER TABLE {PREFIX}images  ADD COLUMN authorid  INT;
 ALTER TABLE {PREFIX}images  ALTER COLUMN authorid SET DEFAULT '0';
-CREATE INDEX images_authorid ON {PREFIX}images (authorid);
+CREATE INDEX authorid_idx ON {PREFIX}images (authorid);

Index: db_update_0.5_0.5.1_mysql.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.5_0.5.1_mysql.sql,v
retrieving revision 1.2
retrieving revision 1.2.6.1
diff -u -d -r1.2 -r1.2.6.1
--- db_update_0.5_0.5.1_mysql.sql	2 Mar 2004 17:57:05 -0000	1.2
+++ db_update_0.5_0.5.1_mysql.sql	13 Oct 2004 09:31:17 -0000	1.2.6.1
@@ -18,14 +18,14 @@
 UPDATE {PREFIX}config
    SET name = REPLACE(name, 'serendipity_plugin_content_rewrite', 'serendipity_event_contentrewrite')
  WHERE name LIKE '%serendipity_plugin_content_rewrite%';
- 
+
 UPDATE {PREFIX}plugins
    SET placement = 'event'
  WHERE name LIKE '%serendipity_event_contentrewrite%';
 
 ALTER TABLE {PREFIX}entries ADD last_modified INT(10) UNSIGNED default null;
-CREATE INDEX timestamp ON {PREFIX}entries (timestamp);
-CREATE INDEX last_modified ON {PREFIX}entries (last_modified);
+CREATE INDEX date_idx ON {PREFIX}entries (timestamp);
+CREATE INDEX mod_idx ON {PREFIX}entries (last_modified);
 UPDATE {PREFIX}entries SET last_modified = timestamp;
 
 INSERT INTO {PREFIX}plugins(name, placement, sort_order) VALUES ('serendipity_event_nl2br:39979424fea674e78399659e67edaf12', 'event', 10);

Index: db_update_0.6.2_0.6.3_postgres.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.6.2_0.6.3_postgres.sql,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- db_update_0.6.2_0.6.3_postgres.sql	6 Sep 2004 09:15:32 -0000	1.4
+++ db_update_0.6.2_0.6.3_postgres.sql	13 Oct 2004 09:31:17 -0000	1.4.2.1
@@ -1,4 +1,4 @@
 ALTER TABLE {PREFIX}images ADD COLUMN path text;
 ALTER TABLE {PREFIX}images ALTER COLUMN path SET DEFAULT '/';
 UPDATE {PREFIX}images SET path = '/';
-CREATE {FULLTEXT} INDEX pathkey on {PREFIX}images (path);
+CREATE {FULLTEXT} INDEX pathkey_idx on {PREFIX}images (path);

Index: db_update_0.6_0.6.1_mysql.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.6_0.6.1_mysql.sql,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- db_update_0.6_0.6.1_mysql.sql	7 Apr 2004 08:17:50 -0000	1.2
+++ db_update_0.6_0.6.1_mysql.sql	13 Oct 2004 09:31:17 -0000	1.2.2.1
@@ -3,13 +3,13 @@
 UPDATE {PREFIX}authors SET userlevel = 1 WHERE authorid > 1;
 
 ALTER TABLE {PREFIX}config  ADD authorid  INT UNSIGNED NOT NULL DEFAULT '0';
-ALTER TABLE {PREFIX}config  ADD INDEX (authorid);
+CREATE INDEX authorid_idx ON {PREFIX}config (authorid);
 
 ALTER TABLE {PREFIX}config  DROP PRIMARY KEY;
 ALTER TABLE {PREFIX}config  ADD PRIMARY KEY (name, authorid);
 
 ALTER TABLE {PREFIX}plugins  ADD authorid  INT UNSIGNED DEFAULT '0';
-ALTER TABLE {PREFIX}plugins  ADD INDEX (authorid);
+CREATE INDEX authorid_idx ON {PREFIX}plugins (authorid);
 
 ALTER TABLE {PREFIX}images  ADD authorid  INT UNSIGNED DEFAULT '0';
-ALTER TABLE {PREFIX}images  ADD INDEX (authorid);
+CREATE INDEX authorid_idx ON {PREFIX}images (authorid);

Index: db_update_0.6.5_0.6.6_mysql.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.6.5_0.6.6_mysql.sql,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- db_update_0.6.5_0.6.6_mysql.sql	18 Jun 2004 09:04:40 -0000	1.1
+++ db_update_0.6.5_0.6.6_mysql.sql	13 Oct 2004 09:31:17 -0000	1.1.2.1
@@ -1 +1 @@
-CREATE UNIQUE INDEX entryid ON {PREFIX}entrycat (entryid, categoryid);
\ No newline at end of file
+CREATE UNIQUE INDEX entryid_idx ON {PREFIX}entrycat (entryid, categoryid);
\ No newline at end of file

Index: db_update_0.8-alpha1_0.8-alpha2_mysql.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/Attic/db_update_0.8-alpha1_0.8-alpha2_mysql.sql,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- db_update_0.8-alpha1_0.8-alpha2_mysql.sql	21 Sep 2004 20:43:16 -0000	1.1.2.1
+++ db_update_0.8-alpha1_0.8-alpha2_mysql.sql	13 Oct 2004 09:31:17 -0000	1.1.2.2
@@ -4,5 +4,5 @@
   value text
 );
 
-CREATE UNIQUE INDEX prop ON {PREFIX}entryproperties (entryid, property);
-CREATE INDEX entryid ON {PREFIX}entryproperties (entryid);
+CREATE UNIQUE INDEX prop_idx ON {PREFIX}entryproperties (entryid, property);
+CREATE INDEX entryid_idx ON {PREFIX}entryproperties (entryid);

[php-blog-cvs] serendipity NEWS,1.239,1.240

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

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

Modified Files:
	NEWS 
Log Message:
document


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -d -r1.239 -r1.240
--- NEWS	7 Oct 2004 14:02:12 -0000	1.239
+++ NEWS	13 Oct 2004 09:25:01 -0000	1.240
@@ -3,6 +3,12 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Fixed entry count and category association bugs using SQLite
+      (garvinhicking)
+
+    * Fixed some error notices for installation with postgreSQL regarding
+      field index names (garvinhicking)
+
     * Fixed wrong mod_rewrite rules to properly redirect to pages.
       (garvinhicking)
 

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.440,1.441

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Fixed entry count and category association bugs using SQLite


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.440
retrieving revision 1.441
diff -u -d -r1.440 -r1.441
--- serendipity_functions.inc.php	7 Oct 2004 10:40:26 -0000	1.440
+++ serendipity_functions.inc.php	13 Oct 2004 09:24:45 -0000	1.441
@@ -592,7 +592,7 @@
                          c.category_icon,
                          c.parentid
                     FROM {$serendipity['dbPrefix']}category AS c
-               LEFT JOIN {$serendipity['dbPrefix']}entrycat AS ec
+                    JOIN {$serendipity['dbPrefix']}entrycat AS ec
                       ON ec.categoryid = c.categoryid
                    WHERE ec.entryid = {$entryid}";
 
@@ -1107,7 +1107,7 @@
 
         // The unique query condition was built previously in serendipity_fetchEntries()
         if (strtolower($serendipity['dbType']) == 'sqlite') {
-            $querystring  = "SELECT count(e.id) {$serendipity['fullCountQuery']} GROUP BY count(e.id)";
+            $querystring  = "SELECT count(e.id) {$serendipity['fullCountQuery']} GROUP BY e.id";
         } else {
             $querystring  = "SELECT count(distinct e.id) {$serendipity['fullCountQuery']}";
         }
@@ -1115,7 +1115,11 @@
         $query = serendipity_db_query($querystring);
 
         if (is_array($query) && isset($query[0])) {
-            $totalEntries = $query[0][0];
+            if (strtolower($serendipity['dbType']) == 'sqlite') {
+                $totalEntries = count($query);
+            } else {
+                $totalEntries = $query[0][0];
+            }
         } else {
             $totalEntries = 0;
         }