You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
(179) |
Apr
(56) |
May
(53) |
Jun
(65) |
Jul
(70) |
Aug
(89) |
Sep
(50) |
Oct
(38) |
Nov
(12) |
Dec
(12) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(57) |
Feb
(226) |
Mar
(172) |
Apr
(194) |
May
(120) |
Jun
(162) |
Jul
(297) |
Aug
(156) |
Sep
(312) |
Oct
(180) |
Nov
(358) |
Dec
(362) |
| 2005 |
Jan
(275) |
Feb
(224) |
Mar
(202) |
Apr
(157) |
May
(133) |
Jun
(115) |
Jul
(211) |
Aug
(257) |
Sep
(135) |
Oct
(116) |
Nov
(106) |
Dec
(81) |
| 2006 |
Jan
(74) |
Feb
(94) |
Mar
(59) |
Apr
(125) |
May
(50) |
Jun
(71) |
Jul
(45) |
Aug
(80) |
Sep
(3) |
Oct
(44) |
Nov
(50) |
Dec
(38) |
| 2007 |
Jan
(46) |
Feb
(33) |
Mar
(24) |
Apr
(28) |
May
(19) |
Jun
(37) |
Jul
(66) |
Aug
(73) |
Sep
(87) |
Oct
(33) |
Nov
(39) |
Dec
(37) |
| 2008 |
Jan
(20) |
Feb
(54) |
Mar
(47) |
Apr
(68) |
May
(10) |
Jun
(13) |
Jul
(13) |
Aug
(25) |
Sep
(11) |
Oct
(22) |
Nov
(22) |
Dec
(34) |
| 2009 |
Jan
(34) |
Feb
(35) |
Mar
(11) |
Apr
(10) |
May
(15) |
Jun
(18) |
Jul
(28) |
Aug
(22) |
Sep
(9) |
Oct
(12) |
Nov
(6) |
Dec
(32) |
| 2010 |
Jan
(11) |
Feb
(7) |
Mar
(9) |
Apr
(3) |
May
(16) |
Jun
(1) |
Jul
(2) |
Aug
(25) |
Sep
(9) |
Oct
(8) |
Nov
(4) |
Dec
(8) |
| 2011 |
Jan
(17) |
Feb
(1) |
Mar
(6) |
Apr
(7) |
May
(5) |
Jun
(2) |
Jul
(12) |
Aug
(3) |
Sep
(18) |
Oct
(3) |
Nov
(2) |
Dec
|
| 2012 |
Jan
(92) |
Feb
(74) |
Mar
(64) |
Apr
(55) |
May
(44) |
Jun
(91) |
Jul
(35) |
Aug
(42) |
Sep
(32) |
Oct
(56) |
Nov
(42) |
Dec
(81) |
| 2013 |
Jan
(117) |
Feb
(130) |
Mar
(33) |
Apr
(36) |
May
(155) |
Jun
(241) |
Jul
(113) |
Aug
(70) |
Sep
(50) |
Oct
(55) |
Nov
(34) |
Dec
(36) |
| 2014 |
Jan
(94) |
Feb
(67) |
Mar
(177) |
Apr
(67) |
May
(147) |
Jun
(137) |
Jul
(58) |
Aug
(56) |
Sep
(62) |
Oct
(35) |
Nov
(118) |
Dec
(53) |
| 2015 |
Jan
(204) |
Feb
(165) |
Mar
(275) |
Apr
(42) |
May
(58) |
Jun
(91) |
Jul
(81) |
Aug
(62) |
Sep
(23) |
Oct
(63) |
Nov
(29) |
Dec
(110) |
| 2016 |
Jan
(82) |
Feb
(55) |
Mar
(48) |
Apr
(92) |
May
(77) |
Jun
(41) |
Jul
(27) |
Aug
(41) |
Sep
(101) |
Oct
(84) |
Nov
(12) |
Dec
(18) |
| 2017 |
Jan
(44) |
Feb
(40) |
Mar
(23) |
Apr
(79) |
May
(27) |
Jun
(12) |
Jul
(20) |
Aug
(14) |
Sep
(3) |
Oct
(9) |
Nov
(4) |
Dec
(9) |
| 2018 |
Jan
(5) |
Feb
(23) |
Mar
(150) |
Apr
(114) |
May
(63) |
Jun
(25) |
Jul
(23) |
Aug
(54) |
Sep
(43) |
Oct
(10) |
Nov
(9) |
Dec
(1) |
| 2019 |
Jan
(1) |
Feb
(27) |
Mar
(27) |
Apr
(64) |
May
(21) |
Jun
(17) |
Jul
(12) |
Aug
(81) |
Sep
(15) |
Oct
(25) |
Nov
(15) |
Dec
(13) |
| 2020 |
Jan
(5) |
Feb
(4) |
Mar
(95) |
Apr
(59) |
May
(53) |
Jun
(22) |
Jul
(3) |
Aug
(13) |
Sep
(10) |
Oct
(4) |
Nov
(3) |
Dec
(1) |
| 2021 |
Jan
(20) |
Feb
(32) |
Mar
(34) |
Apr
(22) |
May
(58) |
Jun
(43) |
Jul
(35) |
Aug
(2) |
Sep
(14) |
Oct
(1) |
Nov
(2) |
Dec
|
| 2022 |
Jan
(2) |
Feb
(6) |
Mar
(4) |
Apr
|
May
(5) |
Jun
(4) |
Jul
(3) |
Aug
(5) |
Sep
(6) |
Oct
(3) |
Nov
(38) |
Dec
(15) |
| 2023 |
Jan
(26) |
Feb
(12) |
Mar
(3) |
Apr
(9) |
May
(2) |
Jun
(5) |
Jul
(8) |
Aug
|
Sep
(39) |
Oct
(11) |
Nov
(3) |
Dec
(3) |
| 2024 |
Jan
(19) |
Feb
(20) |
Mar
(15) |
Apr
(12) |
May
(2) |
Jun
(12) |
Jul
(4) |
Aug
(9) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2025 |
Jan
(72) |
Feb
(80) |
Mar
(92) |
Apr
(35) |
May
(19) |
Jun
(26) |
Jul
(27) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Garvin H. <gar...@us...> - 2004-10-08 11:08:52
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30791 Modified Files: Tag: branch-smarty rss.php Log Message: rss is utf8, thanks to romulus :) Index: rss.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/rss.php,v retrieving revision 1.28 retrieving revision 1.28.2.1 diff -u -d -r1.28 -r1.28.2.1 --- rss.php 1 Jul 2004 11:43:07 -0000 1.28 +++ rss.php 8 Oct 2004 11:08:25 -0000 1.28.2.1 @@ -1,5 +1,5 @@ <?php # $Id$ -header('Content-Type: text/xml'); +header('Content-Type: text/xml; charset=utf-8'); include_once('serendipity_config.inc.php'); $version = strtolower($_GET['version']); |
|
From: Garvin H. <gar...@us...> - 2004-10-07 14:04:13
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22379 Modified Files: Tag: branch-smarty NEWS Log Message: document Index: NEWS =================================================================== RCS file: /cvsroot/php-blog/serendipity/NEWS,v retrieving revision 1.214.2.28 retrieving revision 1.214.2.29 diff -u -d -r1.214.2.28 -r1.214.2.29 --- NEWS 7 Oct 2004 10:32:04 -0000 1.214.2.28 +++ NEWS 7 Oct 2004 14:01:57 -0000 1.214.2.29 @@ -29,6 +29,9 @@ Version 0.7 () ------------------------------------------------------------------------ + * Fixed wrong mod_rewrite rules to properly redirect to pages. + (garvinhicking) + * Trackback moderation support in admin panel, make captcha plugin only work for comments (garvinhicking) |
|
From: Garvin H. <gar...@us...> - 2004-10-07 14:03:44
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22536 Modified Files: NEWS Log Message: document Index: NEWS =================================================================== RCS file: /cvsroot/php-blog/serendipity/NEWS,v retrieving revision 1.238 retrieving revision 1.239 diff -u -d -r1.238 -r1.239 --- NEWS 7 Oct 2004 10:31:23 -0000 1.238 +++ NEWS 7 Oct 2004 14:02:12 -0000 1.239 @@ -3,6 +3,9 @@ Version 0.7 () ------------------------------------------------------------------------ + * Fixed wrong mod_rewrite rules to properly redirect to pages. + (garvinhicking) + * Trackback moderation support in admin panel, make captcha plugin only work for comments (garvinhicking) |
|
From: Garvin H. <gar...@us...> - 2004-10-07 14:02:25
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21933 Modified Files: Tag: branch-smarty htaccess.cgi.rewrite.tpl htaccess.rewrite.tpl serendipity_config.inc.php Log Message: MFH. Index: serendipity_config.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v retrieving revision 1.93.2.11 retrieving revision 1.93.2.12 diff -u -d -r1.93.2.11 -r1.93.2.12 --- serendipity_config.inc.php 1 Oct 2004 14:26:11 -0000 1.93.2.11 +++ serendipity_config.inc.php 7 Oct 2004 14:00:13 -0000 1.93.2.12 @@ -70,21 +70,22 @@ @define('PATH_SMARTY_COMPILE', 'templates_c'); // will be placed inside the template directory /* URI patterns - * Note that it's important to use @ as the pattern delimiter. + * Note that it's important to use @ as the pattern delimiter. DO NOT use shortcuts + * like \d or \s, since mod_rewrite will use the regexps as well and chokes on them. */ @define('PAT_FILENAME', '0-9a-z\.\_!;,\+\-'); @define('PAT_UNSUBSCRIBE', '@/'.PATH_UNSUBSCRIBE.'/(.*)/([0-9]+)@'); @define('PAT_APPROVE', '@/'.PATH_APPROVE.'/(.*)/(.*)/([0-9]+)@'); @define('PAT_DELETE', '@/'.PATH_DELETE.'/(.*)/(.*)/([0-9]+)@'); -@define('PAT_ARCHIVES', '@/'.PATH_ARCHIVES.'/(\d+)\.html@'); -@define('PAT_ARCHIVES_SHORT', '@/'.PATH_ARCHIVES.'/(\d+)[_\-]short\.html@'); -@define('PAT_COMMENTSUB', '@/(\d+)[_\-][' . PAT_FILENAME . ']*\.html@i'); +@define('PAT_ARCHIVES', '@/'.PATH_ARCHIVES.'/([0-9]+)\.html@'); +@define('PAT_ARCHIVES_SHORT', '@/'.PATH_ARCHIVES.'/([0-9]+)[_\-]short\.html@'); +@define('PAT_COMMENTSUB', '@/([0-9]+)[_\-][' . PAT_FILENAME . ']*\.html@i'); @define('PAT_FEEDS', '@/'.PATH_FEEDS.'/@'); @define('PAT_FEED', '@/(index|atom|rss|b2rss|b2rdf).(rss|rdf|rss2|xml)$@'); @define('PAT_ADMIN', '@/'.PATH_ADMIN.'$@'); @define('PAT_ENTRIES', '@/'.PATH_ENTRIES.'$@'); @define('PAT_ARCHIVE', '@/'.PATH_ARCHIVE.'$@'); -@define('PAT_CATEGORIES', '@/'.PATH_CATEGORIES.'/(\d+)[_\-].*@'); +@define('PAT_CATEGORIES', '@/'.PATH_CATEGORIES.'/([0-9]+)@'); @define('PAT_PLUGIN', '@/' . PATH_PLUGIN . '/(.*)@'); @define('USERLEVEL_ADMIN', 255); Index: htaccess.cgi.rewrite.tpl =================================================================== RCS file: /cvsroot/php-blog/serendipity/htaccess.cgi.rewrite.tpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -d -r1.3 -r1.3.2.1 --- htaccess.cgi.rewrite.tpl 30 Aug 2004 14:20:07 -0000 1.3 +++ htaccess.cgi.rewrite.tpl 7 Oct 2004 14:00:13 -0000 1.3.2.1 @@ -14,7 +14,7 @@ RewriteRule ^{PAT_ADMIN} serendipity_admin.php [L,QSA] RewriteRule ^{PAT_ENTRIES} serendipity_entries.php [L,QSA] RewriteRule ^{PAT_ARCHIVE} {indexFile}?url=/{PATH_ARCHIVE} [L,QSA] -RewriteRule ^{PAT_CATEGORIES} {indexFile}?url={PATH_ARCHIVE}/$1 [L,QSA] +RewriteRule ^{PAT_CATEGORIES} {indexFile}?url=/{PATH_CATEGORIES}/$1 [L,QSA] RewriteRule ^{PAT_FEED} rss.php?file=$1&ext=$2 RewriteRule ^{PAT_PLUGIN} {indexFile}?url=plugin/$1 [L,QSA] RewriteRule ^index\.(html?|php.?) {indexFile}?url=index.html [L,QSA] Index: htaccess.rewrite.tpl =================================================================== RCS file: /cvsroot/php-blog/serendipity/htaccess.rewrite.tpl,v retrieving revision 1.16 retrieving revision 1.16.2.1 diff -u -d -r1.16 -r1.16.2.1 --- htaccess.rewrite.tpl 30 Aug 2004 14:20:14 -0000 1.16 +++ htaccess.rewrite.tpl 7 Oct 2004 14:00:13 -0000 1.16.2.1 @@ -16,7 +16,7 @@ RewriteRule ^{PAT_ADMIN} serendipity_admin.php [L,QSA] RewriteRule ^{PAT_ENTRIES} serendipity_entries.php [L,QSA] RewriteRule ^{PAT_ARCHIVE} {indexFile}?url=/{PATH_ARCHIVE} [L,QSA] -RewriteRule ^{PAT_CATEGORIES} {indexFile}?url={PATH_ARCHIVE}/$1 [L,QSA] +RewriteRule ^{PAT_CATEGORIES} {indexFile}?url=/{PATH_CATEGORIES}/$1 [L,QSA] RewriteRule ^{PAT_FEED} rss.php?file=$1&ext=$2 RewriteRule ^{PAT_PLUGIN} {indexFile}?url=plugin/$1 [L,QSA] RewriteRule ^index\.(html?|php.?) {indexFile}?url=index.html [L,QSA] |
|
From: Garvin H. <gar...@us...> - 2004-10-07 14:00:23
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21688 Modified Files: htaccess.cgi.rewrite.tpl htaccess.rewrite.tpl serendipity_config.inc.php Log Message: Fixed bad regular expressions which borked mod_rewrite. It does not seem to support the \d shortcut. :( Index: serendipity_config.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v retrieving revision 1.96 retrieving revision 1.97 diff -u -d -r1.96 -r1.97 --- serendipity_config.inc.php 1 Oct 2004 14:23:45 -0000 1.96 +++ serendipity_config.inc.php 7 Oct 2004 13:58:58 -0000 1.97 @@ -69,21 +69,22 @@ @define('PATH_PLUGIN', 'plugin'); /* URI patterns - * Note that it's important to use @ as the pattern delimiter. + * Note that it's important to use @ as the pattern delimiter. DO NOT use shortcuts + * like \d or \s, since mod_rewrite will use the regexps as well and chokes on them. */ @define('PAT_FILENAME', '0-9a-z\.\_!;,\+\-'); @define('PAT_UNSUBSCRIBE', '@/'.PATH_UNSUBSCRIBE.'/(.*)/([0-9]+)@'); @define('PAT_APPROVE', '@/'.PATH_APPROVE.'/(.*)/(.*)/([0-9]+)@'); @define('PAT_DELETE', '@/'.PATH_DELETE.'/(.*)/(.*)/([0-9]+)@'); -@define('PAT_ARCHIVES', '@/'.PATH_ARCHIVES.'/(\d+)\.html@'); -@define('PAT_ARCHIVES_SHORT', '@/'.PATH_ARCHIVES.'/(\d+)[_\-]short\.html@'); -@define('PAT_COMMENTSUB', '@/(\d+)[_\-][' . PAT_FILENAME . ']*\.html@i'); +@define('PAT_ARCHIVES', '@/'.PATH_ARCHIVES.'/([0-9]+)\.html@'); +@define('PAT_ARCHIVES_SHORT', '@/'.PATH_ARCHIVES.'/([0-9]+)[_\-]short\.html@'); +@define('PAT_COMMENTSUB', '@/([0-9]+)[_\-][' . PAT_FILENAME . ']*\.html@i'); @define('PAT_FEEDS', '@/'.PATH_FEEDS.'/@'); @define('PAT_FEED', '@/(index|atom|rss|b2rss|b2rdf).(rss|rdf|rss2|xml)$@'); @define('PAT_ADMIN', '@/'.PATH_ADMIN.'$@'); @define('PAT_ENTRIES', '@/'.PATH_ENTRIES.'$@'); @define('PAT_ARCHIVE', '@/'.PATH_ARCHIVE.'$@'); -@define('PAT_CATEGORIES', '@/'.PATH_CATEGORIES.'/(\d+)[_\-].*@'); +@define('PAT_CATEGORIES', '@/'.PATH_CATEGORIES.'/([0-9]+)@'); @define('PAT_PLUGIN', '@/' . PATH_PLUGIN . '/(.*)@'); @define('USERLEVEL_ADMIN', 255); Index: htaccess.cgi.rewrite.tpl =================================================================== RCS file: /cvsroot/php-blog/serendipity/htaccess.cgi.rewrite.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- htaccess.cgi.rewrite.tpl 30 Aug 2004 14:20:07 -0000 1.3 +++ htaccess.cgi.rewrite.tpl 7 Oct 2004 13:58:57 -0000 1.4 @@ -14,7 +14,7 @@ RewriteRule ^{PAT_ADMIN} serendipity_admin.php [L,QSA] RewriteRule ^{PAT_ENTRIES} serendipity_entries.php [L,QSA] RewriteRule ^{PAT_ARCHIVE} {indexFile}?url=/{PATH_ARCHIVE} [L,QSA] -RewriteRule ^{PAT_CATEGORIES} {indexFile}?url={PATH_ARCHIVE}/$1 [L,QSA] +RewriteRule ^{PAT_CATEGORIES} {indexFile}?url=/{PATH_CATEGORIES}/$1 [L,QSA] RewriteRule ^{PAT_FEED} rss.php?file=$1&ext=$2 RewriteRule ^{PAT_PLUGIN} {indexFile}?url=plugin/$1 [L,QSA] RewriteRule ^index\.(html?|php.?) {indexFile}?url=index.html [L,QSA] Index: htaccess.rewrite.tpl =================================================================== RCS file: /cvsroot/php-blog/serendipity/htaccess.rewrite.tpl,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- htaccess.rewrite.tpl 30 Aug 2004 14:20:14 -0000 1.16 +++ htaccess.rewrite.tpl 7 Oct 2004 13:58:58 -0000 1.17 @@ -16,7 +16,7 @@ RewriteRule ^{PAT_ADMIN} serendipity_admin.php [L,QSA] RewriteRule ^{PAT_ENTRIES} serendipity_entries.php [L,QSA] RewriteRule ^{PAT_ARCHIVE} {indexFile}?url=/{PATH_ARCHIVE} [L,QSA] -RewriteRule ^{PAT_CATEGORIES} {indexFile}?url={PATH_ARCHIVE}/$1 [L,QSA] +RewriteRule ^{PAT_CATEGORIES} {indexFile}?url=/{PATH_CATEGORIES}/$1 [L,QSA] RewriteRule ^{PAT_FEED} rss.php?file=$1&ext=$2 RewriteRule ^{PAT_PLUGIN} {indexFile}?url=plugin/$1 [L,QSA] RewriteRule ^index\.(html?|php.?) {indexFile}?url=index.html [L,QSA] |
|
From: Garvin H. <gar...@us...> - 2004-10-07 10:53:37
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13044 Modified Files: Tag: branch-smarty serendipity_admin_comments.inc.php Log Message: put in toms latest changes again, I'm sorry for overwriting them. Index: serendipity_admin_comments.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_comments.inc.php,v retrieving revision 1.17.2.7 retrieving revision 1.17.2.8 diff -u -d -r1.17.2.7 -r1.17.2.8 --- serendipity_admin_comments.inc.php 7 Oct 2004 10:32:04 -0000 1.17.2.7 +++ serendipity_admin_comments.inc.php 7 Oct 2004 10:53:24 -0000 1.17.2.8 @@ -86,9 +86,7 @@ 'url' => $serendipity['POST']['url'], 'timestamp' => time() ) - ), - false, - false + ) ); } |
|
From: Garvin H. <gar...@us...> - 2004-10-07 10:41:08
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10535 Modified Files: Tag: branch-smarty serendipity_sidebar_items.php Log Message: fix display entries from the future once more :) Index: serendipity_sidebar_items.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v retrieving revision 1.84.2.5 retrieving revision 1.84.2.6 diff -u -d -r1.84.2.5 -r1.84.2.6 --- serendipity_sidebar_items.php 3 Oct 2004 21:27:53 -0000 1.84.2.5 +++ serendipity_sidebar_items.php 7 Oct 2004 10:40:44 -0000 1.84.2.6 @@ -135,7 +135,7 @@ if (!isset($querystring)) { $querystring = "SELECT timestamp FROM {$serendipity['dbPrefix']}entries e - WHERE e.timestamp >= $ts and e.timestamp <= $endts AND e.isdraft = 'false'"; + WHERE e.timestamp >= $ts and e.timestamp <= $endts AND e.timestamp <= " . time() . " AND e.isdraft = 'false'"; } $rows = serendipity_db_query($querystring); |
|
From: Garvin H. <gar...@us...> - 2004-10-07 10:40:40
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10291 Modified Files: serendipity_functions.inc.php Log Message: fix display entries from the future once more :) Index: serendipity_functions.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v retrieving revision 1.439 retrieving revision 1.440 diff -u -d -r1.439 -r1.440 --- serendipity_functions.inc.php 7 Oct 2004 10:31:23 -0000 1.439 +++ serendipity_functions.inc.php 7 Oct 2004 10:40:26 -0000 1.440 @@ -420,7 +420,7 @@ if (!isset($querystring)) { $querystring = "SELECT timestamp FROM {$serendipity['dbPrefix']}entries e - WHERE e.timestamp >= $ts and e.timestamp <= $endts AND e.isdraft = 'false'"; + WHERE e.timestamp >= $ts and e.timestamp <= $endts AND e.timestamp <= " . time() . " AND e.isdraft = 'false'"; } $rows = serendipity_db_query($querystring); |
|
From: Garvin H. <gar...@us...> - 2004-10-07 10:34:41
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9205 Modified Files: serendipity_rss_exchange.inc.php Log Message: fix charset trouble; the date inside the DB should always be native, since we don'T enforce UTF8 anywhere. Index: serendipity_rss_exchange.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_rss_exchange.inc.php,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- serendipity_rss_exchange.inc.php 6 Oct 2004 13:01:42 -0000 1.10 +++ serendipity_rss_exchange.inc.php 7 Oct 2004 10:34:27 -0000 1.11 @@ -10,7 +10,7 @@ $bodyonly = (isset($serendipity['POST']['bodyonly']) && $serendipity['POST']['bodyonly'] == 'true' ? true : false); if ($item['description']) { - $entry['body'] = $item['description']; + $entry['body'] = utf8_decode($item['description']); } if ($item['content:encoded']) { @@ -26,14 +26,14 @@ // switch). We substract 4 letters because of possible '...' additions to an entry. $testbody = substr(trim(strip_tags($entry['body'])), 0, -4); if ($testbody != substr(trim(strip_tags($item['content:encoded'])), 0, strlen($testbody))) { - $data .= $item['content:encoded'];; + $data .= utf8_decode($item['content:encoded']); } else { - $data = $item['content:encoded']; + $data = utf8_decode($item['content:encoded']); } } - $entry['title'] = $item['title']; - $entry['timestamp'] = strtotime(isset($item['pubdate']) ? $item['pubdate'] : $item['dc:date']); + $entry['title'] = utf8_decode($item['title']); + $entry['timestamp'] = utf8_decode(strtotime(isset($item['pubdate']) ? $item['pubdate'] : $item['dc:date'])); if ($entry['timestamp'] == -1) { $entry['timestamp'] = time(); } @@ -45,7 +45,7 @@ } if (!empty($item['category'])) { - $cat = serendipity_fetchCategoryInfo(0, trim($item['category'])); + $cat = serendipity_fetchCategoryInfo(0, trim(utf8_decode($item['category']))); if (is_array($cat) && isset($cat['categoryid'])) { $entry['categories'][] = $cat['categoryid']; } |
|
From: Garvin H. <gar...@us...> - 2004-10-07 10:34:22
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9037 Modified Files: Tag: branch-smarty serendipity_rss_exchange.inc.php Log Message: fix charset trouble; the date inside the DB should always be native, since we don'T enforce UTF8 anywhere. Index: serendipity_rss_exchange.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_rss_exchange.inc.php,v retrieving revision 1.5.2.5 retrieving revision 1.5.2.6 diff -u -d -r1.5.2.5 -r1.5.2.6 --- serendipity_rss_exchange.inc.php 6 Oct 2004 13:01:58 -0000 1.5.2.5 +++ serendipity_rss_exchange.inc.php 7 Oct 2004 10:34:11 -0000 1.5.2.6 @@ -10,7 +10,7 @@ $bodyonly = (isset($serendipity['POST']['bodyonly']) && $serendipity['POST']['bodyonly'] == 'true' ? true : false); if ($item['description']) { - $entry['body'] = $item['description']; + $entry['body'] = utf8_decode($item['description']); } if ($item['content:encoded']) { @@ -26,14 +26,14 @@ // switch). We substract 4 letters because of possible '...' additions to an entry. $testbody = substr(trim(strip_tags($entry['body'])), 0, -4); if ($testbody != substr(trim(strip_tags($item['content:encoded'])), 0, strlen($testbody))) { - $data .= $item['content:encoded'];; + $data .= utf8_decode($item['content:encoded']); } else { - $data = $item['content:encoded']; + $data = utf8_decode($item['content:encoded']); } } - $entry['title'] = $item['title']; - $entry['timestamp'] = strtotime(isset($item['pubdate']) ? $item['pubdate'] : $item['dc:date']); + $entry['title'] = utf8_decode($item['title']); + $entry['timestamp'] = utf8_decode(strtotime(isset($item['pubdate']) ? $item['pubdate'] : $item['dc:date'])); if ($entry['timestamp'] == -1) { $entry['timestamp'] = time(); } @@ -45,7 +45,7 @@ } if (!empty($item['category'])) { - $cat = serendipity_fetchCategoryInfo(0, trim($item['category'])); + $cat = serendipity_fetchCategoryInfo(0, trim(utf8_decode($item['category']))); if (is_array($cat) && isset($cat['categoryid'])) { $entry['categories'][] = $cat['categoryid']; } |
|
From: Garvin H. <gar...@us...> - 2004-10-07 10:32:20
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8588 Modified Files: Tag: branch-smarty serendipity_functions.inc.php serendipity_admin_comments.inc.php NEWS Log Message: MFH Index: NEWS =================================================================== RCS file: /cvsroot/php-blog/serendipity/NEWS,v retrieving revision 1.214.2.27 retrieving revision 1.214.2.28 diff -u -d -r1.214.2.27 -r1.214.2.28 --- NEWS 6 Oct 2004 10:31:08 -0000 1.214.2.27 +++ NEWS 7 Oct 2004 10:32:04 -0000 1.214.2.28 @@ -29,6 +29,9 @@ Version 0.7 () ------------------------------------------------------------------------ + * Trackback moderation support in admin panel, make captcha plugin + only work for comments (garvinhicking) + * Bug #1037122: BlogPDF plugin will me less strict in file inclusion (garvinhicking) Index: serendipity_functions.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v retrieving revision 1.419.2.42 retrieving revision 1.419.2.43 diff -u -d -r1.419.2.42 -r1.419.2.43 --- serendipity_functions.inc.php 6 Oct 2004 23:02:03 -0000 1.419.2.42 +++ serendipity_functions.inc.php 7 Oct 2004 10:32:04 -0000 1.419.2.43 @@ -1373,6 +1373,7 @@ $query = "SELECT id, allow_comments, moderate_comments, last_modified, timestamp FROM {$serendipity['dbPrefix']}entries WHERE id = '". (int)$id ."'"; $ca = serendipity_db_query($query, true); + $commentInfo['type'] = $type; serendipity_plugin_api::hook_event('frontend_saveComment', $ca, $commentInfo); if (!is_array($ca) || serendipity_db_bool($ca['allow_comments'])) { $title = serendipity_db_escape_string(isset($commentInfo['title']) ? $commentInfo['title'] : ''); Index: serendipity_admin_comments.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_comments.inc.php,v retrieving revision 1.17.2.6 retrieving revision 1.17.2.7 diff -u -d -r1.17.2.6 -r1.17.2.7 --- serendipity_admin_comments.inc.php 5 Oct 2004 19:56:30 -0000 1.17.2.6 +++ serendipity_admin_comments.inc.php 7 Oct 2004 10:32:04 -0000 1.17.2.7 @@ -86,7 +86,9 @@ 'url' => $serendipity['POST']['url'], 'timestamp' => time() ) - ) + ), + false, + false ); } @@ -111,16 +113,25 @@ $searchString .= (!empty($serendipity['GET']['filter'][$filter]) ? "&serendipity[filter][". $filter ."]=". $serendipity['GET']['filter'][$filter] : ""); } -if ( $serendipity['GET']['filter']['show'] == 'approved' ) { - $and .= "AND status = 'approved'"; -} elseif ( $serendipity['GET']['filter']['show'] == 'pending' ) { - $and .= "AND status = 'pending'"; +if ($serendipity['GET']['filter']['show'] == 'approved') { + $and .= "AND status = 'approved'"; + $searchString .= "&serendipity[filter][show]=approved"; +} elseif ($serendipity['GET']['filter']['show'] == 'pending') { + $and .= "AND status = 'pending'"; + $searchString .= "&serendipity[filter][show]=pending"; } else { $serendipity['GET']['filter']['show'] = 'all'; } +if ($serendipity['GET']['filter']['type'] == 'TRACKBACK') { + $c_type = 'TRACKBACK'; + $searchString .= "&serendipity[filter][type]=TRACKBACK"; +} else { + $c_type = 'NORMAL'; +} + /* Paging */ -$sql = serendipity_db_query("SELECT COUNT(*) AS total FROM {$serendipity['dbPrefix']}comments c WHERE c.type = 'NORMAL' ". $and, true); +$sql = serendipity_db_query("SELECT COUNT(*) AS total FROM {$serendipity['dbPrefix']}comments c WHERE c.type = '$c_type' ". $and, true); $totalComments = $sql['total']; $pages = ceil($totalComments/$commentsPerPage); @@ -144,7 +155,7 @@ $limit = serendipity_db_limit_sql(serendipity_db_limit(($page-1)*$commentsPerPage, $commentsPerPage)); $sql = serendipity_db_query("SELECT c.*, e.title FROM {$serendipity['dbPrefix']}comments c LEFT JOIN {$serendipity['dbPrefix']}entries e ON (e.id = c.entry_id) - WHERE type = 'NORMAL' + WHERE type = '$c_type' ". $and ." " . (($serendipity['serendipityUserlevel'] != USERLEVEL_ADMIN) ? 'AND e.authorid = ' . $serendipity['authorId'] : '') . " ORDER BY id DESC $limit"); @@ -203,9 +214,17 @@ <td><input type="text" name="serendipity[filter][body]" size="15" value="<?php echo $serendipity['GET']['filter']['body'] ?>" /></td> <td><?php echo COMMENTS_FILTER_SHOW ?>:</td> <td><select name="serendipity[filter][show]"> - <option value="all"<?php if ( $serendipity['GET']['filter']['show'] == 'all' ) echo ' SELECTED' ?>><?php echo COMMENTS_FILTER_ALL ?></option> - <option value="approved"<?php if ( $serendipity['GET']['filter']['show'] == 'approved' ) echo ' SELECTED' ?>><?php echo COMMENTS_FILTER_APPROVED_ONLY ?></option> - <option value="pending"<?php if ( $serendipity['GET']['filter']['show'] == 'pending' ) echo ' SELECTED' ?>><?php echo COMMENTS_FILTER_NEED_APPROVAL ?></option> + <option value="all"<?php if ( $serendipity['GET']['filter']['show'] == 'all' ) echo ' selected="selected"' ?>><?php echo COMMENTS_FILTER_ALL ?></option> + <option value="approved"<?php if ( $serendipity['GET']['filter']['show'] == 'approved' ) echo ' selected="selected"' ?>><?php echo COMMENTS_FILTER_APPROVED_ONLY ?></option> + <option value="pending"<?php if ( $serendipity['GET']['filter']['show'] == 'pending' ) echo ' selected="selected"' ?>><?php echo COMMENTS_FILTER_NEED_APPROVAL ?></option> + </select></td> + </tr> + <tr> + <td colspan="4"> </td> + <td><?php echo TYPE; ?></td> + <td><select name="serendipity[filter][type]"> + <option value="NORMAL"<?php if ($c_type == 'NORMAL') echo ' selected="selected"' ?>><?php echo COMMENTS; ?></option> + <option value="TRACKBACK"<?php if ($c_type == 'TRACKBACK') echo ' selected="selected"' ?>><?php echo TRACKBACKS; ?></option> </select></td> </tr> <tr> @@ -261,7 +280,7 @@ ?> <tr> <td><a name="c<?php echo $rs['id'] ?>"></a> - <?php echo '#'. $rs['id'] .', '. IN_REPLY_TO .' <strong>'. $rs['title'] .'</strong>, '. ON . ' ' . ucfirst(strftime('%b %e %Y, %H:%M', $rs['timestamp']))?> + <?php echo ($rs['type'] == 'NORMAL' ? COMMENT : TRACKBACK) . ' #'. $rs['id'] .', '. IN_REPLY_TO .' <strong>'. $rs['title'] .'</strong>, '. ON . ' ' . ucfirst(strftime('%b %e %Y, %H:%M', $rs['timestamp']))?> </td> </tr> <tr> @@ -313,4 +332,4 @@ </tr> </table> </form> -<?php } ?> +<?php } ?> \ No newline at end of file |
|
From: Garvin H. <gar...@us...> - 2004-10-07 10:32:17
|
Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8588/plugins/serendipity_event_spamblock Modified Files: Tag: branch-smarty serendipity_event_spamblock.php Log Message: MFH Index: serendipity_event_spamblock.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v retrieving revision 1.4.2.18 retrieving revision 1.4.2.19 diff -u -d -r1.4.2.18 -r1.4.2.19 --- serendipity_event_spamblock.php 28 Sep 2004 21:11:33 -0000 1.4.2.18 +++ serendipity_event_spamblock.php 7 Oct 2004 10:32:03 -0000 1.4.2.19 @@ -276,7 +276,7 @@ } // Check last IP - if ( $this->get_config('ipflood', 2) != 0 ) { + if ($addData['type'] == 'NORMAL' && $this->get_config('ipflood', 2) != 0 ) { $query = "SELECT max(timestamp) AS last_post FROM {$serendipity['dbPrefix']}comments WHERE ip = '" . serendipity_db_escape_string($_SERVER['REMOTE_ADDR']) . "'"; $row = serendipity_db_query($query, true); if (is_array($row) && $row['last_post'] > (time() - $this->get_config('ipflood', 2)*60)) { @@ -310,7 +310,7 @@ } // Captcha checking - if ($show_captcha) { + if ($show_captcha && $addData['type'] == 'NORMAL') { if (!isset($_SESSION['spamblock']['captcha']) || !isset($serendipity['POST']['captcha']) || strtolower($serendipity['POST']['captcha']) != strtolower($_SESSION['spamblock']['captcha'])) { $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_REASON_CAPTCHAS, $addData); $eventData = array('allow_comments' => false); @@ -513,4 +513,4 @@ } /* vim: set sts=4 ts=4 expandtab : */ -?> +?> \ No newline at end of file |
|
From: Garvin H. <gar...@us...> - 2004-10-07 10:31:36
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8409 Modified Files: serendipity_functions.inc.php serendipity_admin_comments.inc.php NEWS Log Message: Trackback moderation support in admin panel, make captcha plugin only work for comments (garvinhicking) Index: NEWS =================================================================== RCS file: /cvsroot/php-blog/serendipity/NEWS,v retrieving revision 1.237 retrieving revision 1.238 diff -u -d -r1.237 -r1.238 --- NEWS 6 Oct 2004 10:30:47 -0000 1.237 +++ NEWS 7 Oct 2004 10:31:23 -0000 1.238 @@ -3,6 +3,9 @@ Version 0.7 () ------------------------------------------------------------------------ + * Trackback moderation support in admin panel, make captcha plugin + only work for comments (garvinhicking) + * Bug #1037122: BlogPDF plugin will me less strict in file inclusion (garvinhicking) Index: serendipity_functions.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v retrieving revision 1.438 retrieving revision 1.439 diff -u -d -r1.438 -r1.439 --- serendipity_functions.inc.php 6 Oct 2004 09:53:46 -0000 1.438 +++ serendipity_functions.inc.php 7 Oct 2004 10:31:23 -0000 1.439 @@ -1787,6 +1787,7 @@ $query = "SELECT id, allow_comments, moderate_comments, last_modified, timestamp FROM {$serendipity['dbPrefix']}entries WHERE id = '". (int)$id ."'"; $ca = serendipity_db_query($query, true); + $commentInfo['type'] = $type; serendipity_plugin_api::hook_event('frontend_saveComment', $ca, $commentInfo); if (!is_array($ca) || serendipity_db_bool($ca['allow_comments'])) { $title = serendipity_db_escape_string(isset($commentInfo['title']) ? $commentInfo['title'] : ''); Index: serendipity_admin_comments.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_comments.inc.php,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- serendipity_admin_comments.inc.php 24 Sep 2004 22:01:26 -0000 1.22 +++ serendipity_admin_comments.inc.php 7 Oct 2004 10:31:23 -0000 1.23 @@ -113,16 +113,25 @@ $searchString .= (!empty($serendipity['GET']['filter'][$filter]) ? "&serendipity[filter][". $filter ."]=". $serendipity['GET']['filter'][$filter] : ""); } -if ( $serendipity['GET']['filter']['show'] == 'approved' ) { - $and .= "AND status = 'approved'"; -} elseif ( $serendipity['GET']['filter']['show'] == 'pending' ) { - $and .= "AND status = 'pending'"; +if ($serendipity['GET']['filter']['show'] == 'approved') { + $and .= "AND status = 'approved'"; + $searchString .= "&serendipity[filter][show]=approved"; +} elseif ($serendipity['GET']['filter']['show'] == 'pending') { + $and .= "AND status = 'pending'"; + $searchString .= "&serendipity[filter][show]=pending"; } else { $serendipity['GET']['filter']['show'] = 'all'; } +if ($serendipity['GET']['filter']['type'] == 'TRACKBACK') { + $c_type = 'TRACKBACK'; + $searchString .= "&serendipity[filter][type]=TRACKBACK"; +} else { + $c_type = 'NORMAL'; +} + /* Paging */ -$sql = serendipity_db_query("SELECT COUNT(*) AS total FROM {$serendipity['dbPrefix']}comments c WHERE c.type = 'NORMAL' ". $and, true); +$sql = serendipity_db_query("SELECT COUNT(*) AS total FROM {$serendipity['dbPrefix']}comments c WHERE c.type = '$c_type' ". $and, true); $totalComments = $sql['total']; $pages = ceil($totalComments/$commentsPerPage); @@ -146,7 +155,7 @@ $limit = serendipity_db_limit_sql(serendipity_db_limit(($page-1)*$commentsPerPage, $commentsPerPage)); $sql = serendipity_db_query("SELECT c.*, e.title FROM {$serendipity['dbPrefix']}comments c LEFT JOIN {$serendipity['dbPrefix']}entries e ON (e.id = c.entry_id) - WHERE type = 'NORMAL' + WHERE type = '$c_type' ". $and ." " . (($serendipity['serendipityUserlevel'] != USERLEVEL_ADMIN) ? 'AND e.authorid = ' . $serendipity['authorId'] : '') . " ORDER BY id DESC $limit"); @@ -205,9 +214,17 @@ <td><input type="text" name="serendipity[filter][body]" size="15" value="<?php echo $serendipity['GET']['filter']['body'] ?>" /></td> <td><?php echo COMMENTS_FILTER_SHOW ?>:</td> <td><select name="serendipity[filter][show]"> - <option value="all"<?php if ( $serendipity['GET']['filter']['show'] == 'all' ) echo ' SELECTED' ?>><?php echo COMMENTS_FILTER_ALL ?></option> - <option value="approved"<?php if ( $serendipity['GET']['filter']['show'] == 'approved' ) echo ' SELECTED' ?>><?php echo COMMENTS_FILTER_APPROVED_ONLY ?></option> - <option value="pending"<?php if ( $serendipity['GET']['filter']['show'] == 'pending' ) echo ' SELECTED' ?>><?php echo COMMENTS_FILTER_NEED_APPROVAL ?></option> + <option value="all"<?php if ( $serendipity['GET']['filter']['show'] == 'all' ) echo ' selected="selected"' ?>><?php echo COMMENTS_FILTER_ALL ?></option> + <option value="approved"<?php if ( $serendipity['GET']['filter']['show'] == 'approved' ) echo ' selected="selected"' ?>><?php echo COMMENTS_FILTER_APPROVED_ONLY ?></option> + <option value="pending"<?php if ( $serendipity['GET']['filter']['show'] == 'pending' ) echo ' selected="selected"' ?>><?php echo COMMENTS_FILTER_NEED_APPROVAL ?></option> + </select></td> + </tr> + <tr> + <td colspan="4"> </td> + <td><?php echo TYPE; ?></td> + <td><select name="serendipity[filter][type]"> + <option value="NORMAL"<?php if ($c_type == 'NORMAL') echo ' selected="selected"' ?>><?php echo COMMENTS; ?></option> + <option value="TRACKBACK"<?php if ($c_type == 'TRACKBACK') echo ' selected="selected"' ?>><?php echo TRACKBACKS; ?></option> </select></td> </tr> <tr> @@ -263,7 +280,7 @@ ?> <tr> <td><a name="c<?php echo $rs['id'] ?>"></a> - <?php echo '#'. $rs['id'] .', '. IN_REPLY_TO .' <strong>'. $rs['title'] .'</strong>, '. ON . ' ' . ucfirst(strftime('%b %e %Y, %H:%M', $rs['timestamp']))?> + <?php echo ($rs['type'] == 'NORMAL' ? COMMENT : TRACKBACK) . ' #'. $rs['id'] .', '. IN_REPLY_TO .' <strong>'. $rs['title'] .'</strong>, '. ON . ' ' . ucfirst(strftime('%b %e %Y, %H:%M', $rs['timestamp']))?> </td> </tr> <tr> @@ -315,4 +332,4 @@ </tr> </table> </form> -<?php } ?> +<?php } ?> \ No newline at end of file |
|
From: Garvin H. <gar...@us...> - 2004-10-07 10:31:35
|
Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8409/plugins/serendipity_event_spamblock Modified Files: serendipity_event_spamblock.php Log Message: Trackback moderation support in admin panel, make captcha plugin only work for comments (garvinhicking) Index: serendipity_event_spamblock.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- serendipity_event_spamblock.php 7 Oct 2004 08:18:20 -0000 1.23 +++ serendipity_event_spamblock.php 7 Oct 2004 10:31:22 -0000 1.24 @@ -230,7 +230,7 @@ $hooks = &$bag->get('event_hooks'); - if (isset($hooks[$event]) && @$_REQUEST['type'] != 'trackback' && @$_REQUEST['type'] != 'pingback') { + if (isset($hooks[$event])) { $captchas_ttl = $this->get_config('captchas_ttl', 7); $captchas = (serendipity_db_bool($this->get_config('captchas', true)) ? true : false); // Check if the entry is older than the allowed amount of time. Enforce kaptchas if that is true @@ -276,7 +276,7 @@ } // Check last IP - if ( $this->get_config('ipflood', 2) != 0 ) { + if ($addData['type'] == 'NORMAL' && $this->get_config('ipflood', 2) != 0 ) { $query = "SELECT max(timestamp) AS last_post FROM {$serendipity['dbPrefix']}comments WHERE ip = '" . serendipity_db_escape_string($_SERVER['REMOTE_ADDR']) . "'"; $row = serendipity_db_query($query, true); if (is_array($row) && $row['last_post'] > (time() - $this->get_config('ipflood', 2)*60)) { @@ -310,7 +310,7 @@ } // Captcha checking - if ($show_captcha) { + if ($show_captcha && $addData['type'] == 'NORMAL') { if (!isset($_SESSION['spamblock']['captcha']) || !isset($serendipity['POST']['captcha']) || strtolower($serendipity['POST']['captcha']) != strtolower($_SESSION['spamblock']['captcha'])) { $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_REASON_CAPTCHAS, $addData); $eventData = array('allow_comments' => false); @@ -513,4 +513,4 @@ } /* vim: set sts=4 ts=4 expandtab : */ -?> +?> \ No newline at end of file |
|
From: Jannis H. <jhe...@us...> - 2004-10-07 08:19:56
|
Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13057/plugins/serendipity_event_spamblock Modified Files: serendipity_event_spamblock.php Log Message: Hotfix for the bug that is causing the spamblock plugin to block trackbacks. See mailinglist... Index: serendipity_event_spamblock.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- serendipity_event_spamblock.php 28 Sep 2004 21:07:12 -0000 1.22 +++ serendipity_event_spamblock.php 7 Oct 2004 08:18:20 -0000 1.23 @@ -230,7 +230,7 @@ $hooks = &$bag->get('event_hooks'); - if (isset($hooks[$event])) { + if (isset($hooks[$event]) && @$_REQUEST['type'] != 'trackback' && @$_REQUEST['type'] != 'pingback') { $captchas_ttl = $this->get_config('captchas_ttl', 7); $captchas = (serendipity_db_bool($this->get_config('captchas', true)) ? true : false); // Check if the entry is older than the allowed amount of time. Enforce kaptchas if that is true |
|
From: Tom S. <tom...@us...> - 2004-10-06 23:02:17
|
Update of /cvsroot/php-blog/serendipity/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8146/templates/default Modified Files: Tag: branch-smarty commentform.tpl Log Message: - Fix broken comment submission Index: commentform.tpl =================================================================== RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/commentform.tpl,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -u -d -r1.1.2.5 -r1.1.2.6 --- commentform.tpl 27 Sep 2004 12:13:51 -0000 1.1.2.5 +++ commentform.tpl 6 Oct 2004 23:02:04 -0000 1.1.2.6 @@ -1,6 +1,6 @@ <div class="serendipityCommentForm"> <a id="serendipity_CommentForm"></a> - <form id="serendipity_comment" action="{$commentform_url}#feedback" method="post"> + <form id="serendipity_comment" action="{$commentform_action}#feedback" method="post"> <div><input type="hidden" name="serendipity[entry_id]" value="{$commentform_id}" /></div> <table border="0" width="100%" cellpadding="3"> <tr> |
|
From: Tom S. <tom...@us...> - 2004-10-06 23:02:16
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8146 Modified Files: Tag: branch-smarty serendipity_functions.inc.php Log Message: - Fix broken comment submission Index: serendipity_functions.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v retrieving revision 1.419.2.41 retrieving revision 1.419.2.42 diff -u -d -r1.419.2.41 -r1.419.2.42 --- serendipity_functions.inc.php 6 Oct 2004 09:55:02 -0000 1.419.2.41 +++ serendipity_functions.inc.php 6 Oct 2004 23:02:03 -0000 1.419.2.42 @@ -215,7 +215,7 @@ $serendipity['smarty']->assign( array( - 'commentform_url' => $url, + 'commentform_action' => $url, 'commentform_id' => $id, 'commentform_name' => isset($data['name']) ? $data['name'] : (isset($serendipity['COOKIE']['name']) ? $serendipity['COOKIE']['name'] : ''), 'commentform_email' => isset($data['email']) ? $data['email'] : (isset($serendipity['COOKIE']['email']) ? $serendipity['COOKIE']['email'] : ''), |
|
From: Tom S. <tom...@us...> - 2004-10-06 19:18:29
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17305 Modified Files: Tag: branch-smarty serendipity_functions_installer.inc.php Log Message: - Fix installation, we should just make sure templates_c is writable, thanks romulus Index: serendipity_functions_installer.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_installer.inc.php,v retrieving revision 1.35.2.1 retrieving revision 1.35.2.2 diff -u -d -r1.35.2.1 -r1.35.2.2 --- serendipity_functions_installer.inc.php 9 Sep 2004 16:41:31 -0000 1.35.2.1 +++ serendipity_functions_installer.inc.php 6 Oct 2004 19:18:15 -0000 1.35.2.2 @@ -490,7 +490,7 @@ $errs[] = sprintf(DIRECTORY_CREATE_ERROR, $_POST['serendipityPath'] . PATH_ARCHIVES); $errs[] = sprintf(DIRECTORY_RUN_CMD , 'mkdir' , $_POST['serendipityPath'] . PATH_SMARTY_COMPILE); $errs[] = sprintf(DIRECTORY_RUN_CMD , 'chmod go+rwx', $_POST['serendipityPath'] . PATH_SMARTY_COMPILE); - } elseif (is_dir($_POST['serendipityPath'] . PATH_SMARTY_COMPILE) && @chmod($_POST['serendipityPath'] . PATH_SMARTY_COMPILE, $umask) !== true) { + } elseif (is_dir($_POST['serendipityPath'] . PATH_SMARTY_COMPILE) && !is_writeable($_POST['serendipityPath'] . PATH_SMARTY_COMPILE) && @chmod($_POST['serendipityPath'] . PATH_SMARTY_COMPILE, $umask) !== true) { $errs[] = sprintf(DIRECTORY_RUN_CMD , 'chmod go+rwx', $_POST['serendipityPath'] . PATH_SMARTY_COMPILE); } |
|
From: Garvin H. <gar...@us...> - 2004-10-06 13:02:25
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15951 Modified Files: Tag: branch-smarty serendipity_rss_exchange.inc.php Log Message: mfh Index: serendipity_rss_exchange.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_rss_exchange.inc.php,v retrieving revision 1.5.2.4 retrieving revision 1.5.2.5 diff -u -d -r1.5.2.4 -r1.5.2.5 --- serendipity_rss_exchange.inc.php 28 Sep 2004 10:13:29 -0000 1.5.2.4 +++ serendipity_rss_exchange.inc.php 6 Oct 2004 13:01:58 -0000 1.5.2.5 @@ -55,6 +55,10 @@ $entry['categories'][] = $serendipity['POST']['category']; } + if (!isset($entry['extended'])) { + $entry['extended'] = ''; + } + $entry['allow_comments'] = true; return true; |
|
From: Garvin H. <gar...@us...> - 2004-10-06 13:02:16
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15813 Modified Files: serendipity_rss_exchange.inc.php Log Message: at least insert empty string when importing Index: serendipity_rss_exchange.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_rss_exchange.inc.php,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- serendipity_rss_exchange.inc.php 28 Sep 2004 10:13:25 -0000 1.9 +++ serendipity_rss_exchange.inc.php 6 Oct 2004 13:01:42 -0000 1.10 @@ -55,6 +55,10 @@ $entry['categories'][] = $serendipity['POST']['category']; } + if (!isset($entry['extended'])) { + $entry['extended'] = ''; + } + $entry['allow_comments'] = true; return true; |
|
From: Garvin H. <gar...@us...> - 2004-10-06 10:31:42
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13780 Modified Files: Tag: branch-smarty NEWS Log Message: use full include path so open_basedir won't complain. See bug #1037122 Index: NEWS =================================================================== RCS file: /cvsroot/php-blog/serendipity/NEWS,v retrieving revision 1.214.2.26 retrieving revision 1.214.2.27 diff -u -d -r1.214.2.26 -r1.214.2.27 --- NEWS 6 Oct 2004 09:54:45 -0000 1.214.2.26 +++ NEWS 6 Oct 2004 10:31:08 -0000 1.214.2.27 @@ -29,6 +29,9 @@ Version 0.7 () ------------------------------------------------------------------------ + * Bug #1037122: BlogPDF plugin will me less strict in file inclusion + (garvinhicking) + * Fixed wrong entry id displayed in RSS comment feed. Thanks to romulus! (garvinhicking) |
|
From: Garvin H. <gar...@us...> - 2004-10-06 10:31:41
|
Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_blogpdf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13780/plugins/serendipity_event_blogpdf Modified Files: Tag: branch-smarty serendipity_event_blogpdf.php Log Message: use full include path so open_basedir won't complain. See bug #1037122 Index: serendipity_event_blogpdf.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_blogpdf/serendipity_event_blogpdf.php,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -d -r1.7 -r1.7.2.1 --- serendipity_event_blogpdf.php 24 Aug 2004 17:32:47 -0000 1.7 +++ serendipity_event_blogpdf.php 6 Oct 2004 10:31:08 -0000 1.7.2.1 @@ -42,8 +42,8 @@ break; } -define('FPDF_FONTPATH','plugins/serendipity_event_blogpdf/font/'); -require('fpdf.php'); +define('FPDF_FONTPATH', S9Y_INCLUDE_PATH . 'plugins/serendipity_event_blogpdf/font/'); +include_once S9Y_INCLUDE_PATH . 'plugins/serendipity_event_blogpdf/fpdf.php'; class PDF extends FPDF { var $TOC = array(); @@ -416,4 +416,4 @@ } /* vim: set sts=4 ts=4 expandtab : */ -?> +?> \ No newline at end of file |
|
From: Garvin H. <gar...@us...> - 2004-10-06 10:31:05
|
Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_blogpdf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13465/plugins/serendipity_event_blogpdf Modified Files: serendipity_event_blogpdf.php Log Message: use full include path so open_basedir won't complain. See bug #1037122 Index: serendipity_event_blogpdf.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_blogpdf/serendipity_event_blogpdf.php,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- serendipity_event_blogpdf.php 24 Aug 2004 17:32:47 -0000 1.7 +++ serendipity_event_blogpdf.php 6 Oct 2004 10:30:47 -0000 1.8 @@ -42,8 +42,8 @@ break; } -define('FPDF_FONTPATH','plugins/serendipity_event_blogpdf/font/'); -require('fpdf.php'); +define('FPDF_FONTPATH', S9Y_INCLUDE_PATH . 'plugins/serendipity_event_blogpdf/font/'); +include_once S9Y_INCLUDE_PATH . 'plugins/serendipity_event_blogpdf/fpdf.php'; class PDF extends FPDF { var $TOC = array(); @@ -416,4 +416,4 @@ } /* vim: set sts=4 ts=4 expandtab : */ -?> +?> \ No newline at end of file |
|
From: Garvin H. <gar...@us...> - 2004-10-06 10:31:04
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13465 Modified Files: NEWS Log Message: use full include path so open_basedir won't complain. See bug #1037122 Index: NEWS =================================================================== RCS file: /cvsroot/php-blog/serendipity/NEWS,v retrieving revision 1.236 retrieving revision 1.237 diff -u -d -r1.236 -r1.237 --- NEWS 6 Oct 2004 09:53:45 -0000 1.236 +++ NEWS 6 Oct 2004 10:30:47 -0000 1.237 @@ -3,6 +3,9 @@ Version 0.7 () ------------------------------------------------------------------------ + * Bug #1037122: BlogPDF plugin will me less strict in file inclusion + (garvinhicking) + * Fixed wrong entry id displayed in RSS comment feed. Thanks to romulus! (garvinhicking) |
|
From: Garvin H. <gar...@us...> - 2004-10-06 09:55:16
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6565 Modified Files: Tag: branch-smarty NEWS serendipity_functions.inc.php Log Message: fixed wrong id for comment rss feed Index: serendipity_functions.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v retrieving revision 1.419.2.40 retrieving revision 1.419.2.41 diff -u -d -r1.419.2.40 -r1.419.2.41 --- serendipity_functions.inc.php 5 Oct 2004 19:56:30 -0000 1.419.2.40 +++ serendipity_functions.inc.php 6 Oct 2004 09:55:02 -0000 1.419.2.41 @@ -1607,8 +1607,9 @@ if (is_array($entries)) { foreach ($entries as $entry) { + $id = (isset($entry['entryid']) && !empty($entry['entryid']) ? $entry['entryid'] : $entry['id']); $guid = serendipity_rss_getguid($entry, $comments); - $entryLink = serendipity_archiveURL($entry['id'], $entry['title']); + $entryLink = serendipity_archiveURL($id, $entry['title']); if ($comments == true) { // Display username as part of the title for easier feed-readability $entry['title'] = $entry['username'] . ': ' . $entry['title']; @@ -1621,17 +1622,7 @@ $ext = ''; } - if (isset($_GET['all']) && $_GET['all']) { - $addParam = array('no_scramble' => true); - } else { - $addParam = array(); - } - - serendipity_plugin_api::hook_event( - 'frontend_display', - $entry, - $addParam - ); + serendipity_plugin_api::hook_event('frontend_display', $entry); // Do some relative -> absolute URI replacing magic. Replaces all HREF/SRC (<a>, <img>, ...) references to only the serendipitypath with the full baseURL URI // garvin: Could impose some problems. Closely watch this one. $entry['body'] = preg_replace('@(href|src)=("|\')(' . preg_quote($serendipity['serendipityHTTPPath']) . ')(.*)("|\')(.*)>@imsU', '\1=\2' . $serendipity['baseURL'] . '\4\2\6>', $entry['body']); @@ -1662,13 +1653,13 @@ <issued><?php echo gmdate('Y-m-d\TH:i:s\Z', $entry['timestamp']); ?></issued> <created><?php echo gmdate('Y-m-d\TH:i:s\Z', $entry['timestamp']); ?></created> <modified><?php echo gmdate('Y-m-d\TH:i:s\Z', $entry['last_modified']); ?></modified> - <wfw:comment><?php echo $serendipity['baseURL']; ?>wfwcomment.php?cid=<?php echo (isset($entry['entryid']) && $entry['entryid'] != '' ? $entry['entryid'] : $entry['id']); ?></wfw:comment> + <wfw:comment><?php echo $serendipity['baseURL']; ?>wfwcomment.php?cid=<?php echo $id; ?></wfw:comment> <?php if ($comments === false) { ?> <slash:comments><?php echo $entry['comments']; ?></slash:comments> - <wfw:commentRss><?php echo $serendipity['baseURL']; ?>rss.php?version=<?php echo $version; ?>&type=comments&cid=<?php echo (isset($entry['entryid']) && $entry['entryid'] != '' ? $entry['entryid'] : $entry['id']); ?></wfw:commentRss> + <wfw:commentRss><?php echo $serendipity['baseURL']; ?>rss.php?version=<?php echo $version; ?>&type=comments&cid=<?php echo $id; ?></wfw:commentRss> <?php } ?> @@ -1700,12 +1691,12 @@ } ?> <comments><?php echo $entryLink; ?>#comments</comments> - <wfw:comment><?php echo $serendipity['baseURL']; ?>wfwcomment.php?cid=<?php echo (isset($entry['entryid']) && $entry['entryid'] != '' ? $entry['entryid'] : $entry['id']); ?></wfw:comment> + <wfw:comment><?php echo $serendipity['baseURL']; ?>wfwcomment.php?cid=<?php echo $id; ?></wfw:comment> <?php if ($comments === false) { ?> <slash:comments><?php echo $entry['comments']; ?></slash:comments> - <wfw:commentRss><?php echo $serendipity['baseURL']; ?>rss.php?version=<?php echo $version; ?>&type=comments&cid=<?php echo (isset($entry['entryid']) && $entry['entryid'] != '' ? $entry['entryid'] : $entry['id']); ?></wfw:commentRss> + <wfw:commentRss><?php echo $serendipity['baseURL']; ?>rss.php?version=<?php echo $version; ?>&type=comments&cid=<?php echo $id; ?></wfw:commentRss> <?php } ?> @@ -1759,12 +1750,12 @@ <dc:creator><?php echo serendipity_utf8_encode(htmlspecialchars($entry['email'])) . ' (' . serendipity_utf8_encode(htmlspecialchars($entry['username'])) . ')'; ?></dc:creator> <dc:subject><?php echo serendipity_utf8_encode(htmlspecialchars(implode(', ', $categories))); ?></dc:subject> <dc:date><?php echo date('Y-m-d\TH:i:s\Z', $entry['timestamp']); ?></dc:date> - <wfw:comment><?php echo $serendipity['baseURL']; ?>wfwcomment.php?cid=<?php echo (isset($entry['entryid']) && $entry['entryid'] != '' ? $entry['entryid'] : $entry['id']); ?></wfw:comment> + <wfw:comment><?php echo $serendipity['baseURL']; ?>wfwcomment.php?cid=<?php echo $id; ?></wfw:comment> <?php if ($comments === false) { ?> <slash:comments><?php echo $entry['comments']; ?></slash:comments> - <wfw:commentRss><?php echo $serendipity['baseURL']; ?>rss.php?version=<?php echo $version; ?>&type=comments&cid=<?php echo (isset($entry['entryid']) && $entry['entryid'] != '' ? $entry['entryid'] : $entry['id']); ?></wfw:commentRss> + <wfw:commentRss><?php echo $serendipity['baseURL']; ?>rss.php?version=<?php echo $version; ?>&type=comments&cid=<?php echo $id; ?></wfw:commentRss> <?php } ?> Index: NEWS =================================================================== RCS file: /cvsroot/php-blog/serendipity/NEWS,v retrieving revision 1.214.2.25 retrieving revision 1.214.2.26 diff -u -d -r1.214.2.25 -r1.214.2.26 --- NEWS 27 Sep 2004 10:24:38 -0000 1.214.2.25 +++ NEWS 6 Oct 2004 09:54:45 -0000 1.214.2.26 @@ -29,6 +29,9 @@ Version 0.7 () ------------------------------------------------------------------------ + * Fixed wrong entry id displayed in RSS comment feed. Thanks to + romulus! (garvinhicking) + * Fixed file permission checks when removing images inside media manager. Thanks to Thomas from the forums! (garvinhicking) |
