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-06 09:54:03
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6373 Modified Files: NEWS 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.437 retrieving revision 1.438 diff -u -d -r1.437 -r1.438 --- serendipity_functions.inc.php 3 Oct 2004 21:16:23 -0000 1.437 +++ serendipity_functions.inc.php 6 Oct 2004 09:53:46 -0000 1.438 @@ -2021,8 +2021,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']; @@ -2066,13 +2067,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 } ?> @@ -2104,12 +2105,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 } ?> @@ -2163,12 +2164,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.235 retrieving revision 1.236 diff -u -d -r1.235 -r1.236 --- NEWS 27 Sep 2004 10:24:26 -0000 1.235 +++ NEWS 6 Oct 2004 09:53:45 -0000 1.236 @@ -3,6 +3,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) |
|
From: Tom S. <tom...@us...> - 2004-10-05 19:57:31
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050 Modified Files: Tag: branch-smarty comment.php serendipity_admin_comments.inc.php serendipity_functions.inc.php Log Message: - Remove $allow_comments also, not used for anything Index: serendipity_functions.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v retrieving revision 1.419.2.39 retrieving revision 1.419.2.40 diff -u -d -r1.419.2.39 -r1.419.2.40 --- serendipity_functions.inc.php 5 Oct 2004 19:40:39 -0000 1.419.2.39 +++ serendipity_functions.inc.php 5 Oct 2004 19:56:30 -0000 1.419.2.40 @@ -1010,7 +1010,7 @@ serendipity_printTrackbacks(serendipity_fetchTrackbacks($entry['id'])); ob_start(); // TODO: Remove recursion and output buffering - serendipity_printComments(serendipity_fetchComments($entry['id']),(isset($entry['allow_comments']) ? $entry['allow_comments'] : true), $viewmode); + serendipity_printComments(serendipity_fetchComments($entry['id']), $viewmode); if (!empty($serendipity['POST']['preview'])) { serendipity_printComments( @@ -1024,7 +1024,6 @@ 'timestamp' => time() ) ), - false, $serendipity['POST']['replyTo'] ); } @@ -1228,8 +1227,7 @@ } /*TODO: Don't know how to get recursion done with Smarty in a smarty way.*/ -function serendipity_printComments($comments, $allow_comments = true, $parentid = 0, $indent = '') -{ +function serendipity_printComments($comments, $parentid = 0, $indent = '') { global $serendipity; if ($parentid === VIEWMODE_THREADED) { @@ -1304,7 +1302,7 @@ </div> <?php if ($comment['id'] && $parentid !== VIEWMODE_LINEAR ) { - serendipity_printComments($comments, $allow_comments, $comment['id'], $indent . $i . '.'); + serendipity_printComments($comments, $comment['id'], $indent . $i . '.'); } ?> </div> Index: comment.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/comment.php,v retrieving revision 1.44.2.4 retrieving revision 1.44.2.5 diff -u -d -r1.44.2.4 -r1.44.2.5 --- comment.php 5 Oct 2004 19:40:39 -0000 1.44.2.4 +++ comment.php 5 Oct 2004 19:56:30 -0000 1.44.2.5 @@ -128,7 +128,7 @@ $query = "SELECT id, last_modified, timestamp, allow_comments, moderate_comments FROM {$serendipity['dbPrefix']}entries WHERE id = '" . $id . "'"; $ca = serendipity_db_query($query, true); - serendipity_printComments(serendipity_fetchComments($id), (isset($ca['allow_comments']) ? $ca['allow_comments'] : true)); + serendipity_printComments(serendipity_fetchComments($id)); if ($serendipity['POST']['preview']) { serendipity_printComments( @@ -140,8 +140,7 @@ 'url' => $serendipity['POST']['url'], 'timestamp' => time() ) - ), - false + ) ); } Index: serendipity_admin_comments.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_comments.inc.php,v retrieving revision 1.17.2.5 retrieving revision 1.17.2.6 diff -u -d -r1.17.2.5 -r1.17.2.6 --- serendipity_admin_comments.inc.php 5 Oct 2004 19:40:39 -0000 1.17.2.5 +++ serendipity_admin_comments.inc.php 5 Oct 2004 19:56:30 -0000 1.17.2.6 @@ -86,8 +86,7 @@ 'url' => $serendipity['POST']['url'], 'timestamp' => time() ) - ), - false + ) ); } |
|
From: Tom S. <tom...@us...> - 2004-10-05 19:41:41
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24698 Modified Files: Tag: branch-smarty comment.php serendipity_admin_comments.inc.php serendipity_functions.inc.php Log Message: - Move the ability to toggle comments out of _printComments and into the templates, where it belongs Index: serendipity_functions.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v retrieving revision 1.419.2.38 retrieving revision 1.419.2.39 diff -u -d -r1.419.2.38 -r1.419.2.39 --- serendipity_functions.inc.php 3 Oct 2004 21:27:53 -0000 1.419.2.38 +++ serendipity_functions.inc.php 5 Oct 2004 19:40:39 -0000 1.419.2.39 @@ -966,6 +966,11 @@ $entry['rdf_ident'] = serendipity_archiveURL($entry['id'], $entry['title'], 'baseURL'); $entry['title'] = htmlspecialchars($entry['title']); $entry['commURL'] = serendipity_archiveURL($entry['id'], $entry['title'], 'baseURL', false); + $entry['link_allow_comments'] = $serendipity['baseURL'] . 'comment.php?serendipity[switch]=enable&serendipity[entry]=' . $entry['id']; + $entry['link_deny_comments'] = $serendipity['baseURL'] . 'comment.php?serendipity[switch]=disable&serendipity[entry]=' . $entry['id']; + + + $entry['allow_comments'] = serendipity_db_bool($entry['allow_comments']); if (strlen($entry['extended'])) { $entry['has_extended'] = true; @@ -1005,7 +1010,7 @@ serendipity_printTrackbacks(serendipity_fetchTrackbacks($entry['id'])); ob_start(); // TODO: Remove recursion and output buffering - serendipity_printComments(serendipity_fetchComments($entry['id']),(isset($entry['allow_comments']) ? $entry['allow_comments'] : true), true, $viewmode); + serendipity_printComments(serendipity_fetchComments($entry['id']),(isset($entry['allow_comments']) ? $entry['allow_comments'] : true), $viewmode); if (!empty($serendipity['POST']['preview'])) { serendipity_printComments( @@ -1020,7 +1025,6 @@ ) ), false, - false, $serendipity['POST']['replyTo'] ); } @@ -1040,8 +1044,7 @@ 'is_cview_linear' => ($serendipity['GET']['cview'] == VIEWMODE_LINEAR ? true : false), 'comments_messagestack' => (isset($serendipity['messagestack']['comments']) ? (array)$serendipity['messagestack']['comments'] : false), 'is_comment_added' => (isset($serendipity['GET']['csuccess']) && $serendipity['GET']['csuccess'] == 'true' ? true: false), - 'is_comment_moderate' => (isset($serendipity['GET']['csuccess']) && $serendipity['GET']['csuccess'] == 'moderate' ? true: false), - 'is_comment_closed' => (!serendipity_db_bool($entry['allow_comments']) ? true : false) + 'is_comment_moderate' => (isset($serendipity['GET']['csuccess']) && $serendipity['GET']['csuccess'] == 'moderate' ? true: false) ) ); @@ -1225,7 +1228,7 @@ } /*TODO: Don't know how to get recursion done with Smarty in a smarty way.*/ -function serendipity_printComments($comments, $allow_comments = true, $show_admin = true, $parentid = 0, $indent = '') +function serendipity_printComments($comments, $allow_comments = true, $parentid = 0, $indent = '') { global $serendipity; @@ -1301,7 +1304,7 @@ </div> <?php if ($comment['id'] && $parentid !== VIEWMODE_LINEAR ) { - serendipity_printComments($comments, $allow_comments, $show_admin, $comment['id'], $indent . $i . '.'); + serendipity_printComments($comments, $allow_comments, $comment['id'], $indent . $i . '.'); } ?> </div> @@ -1312,19 +1315,6 @@ if ($parentid != 0 && $parentid !== VIEWMODE_LINEAR) { return true; } - - if ($show_admin && $_SESSION['serendipityAuthedUser'] === true && ($_SESSION['serendipityUserlevel'] >= USERLEVEL_CHIEF || $_SESSION['serendipityAuthorid'] == $comment['authorid'])) { - if (!isset($comment['entry_id'])) { - $comment = array('entry_id' => (isset($serendipity['GET']['id']) ? $serendipity['GET']['id'] : $serendipity['GET']['entry_id'])); - } - - if (serendipity_db_bool($allow_comments)) { - echo '<div class="serendipity_center">(<a href="' . $serendipity['baseURL'] . 'comment.php?serendipity[switch]=disable&serendipity[entry]=' . $comment['entry_id'] . '">' . COMMENTS_DISABLE . '</a>)</div>'; - } else { - echo '<div class="serendipity_center">(<a href="' . $serendipity['baseURL'] . 'comment.php?serendipity[switch]=enable&serendipity[entry]=' . $comment['entry_id'] . '">' . COMMENTS_ENABLE . '</a>)</div>'; - } - echo '<br />'; - } } function serendipity_printTrackbacks($comments) Index: comment.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/comment.php,v retrieving revision 1.44.2.3 retrieving revision 1.44.2.4 diff -u -d -r1.44.2.3 -r1.44.2.4 --- comment.php 24 Sep 2004 13:00:14 -0000 1.44.2.3 +++ comment.php 5 Oct 2004 19:40:39 -0000 1.44.2.4 @@ -141,7 +141,6 @@ 'timestamp' => time() ) ), - false, false ); } Index: serendipity_admin_comments.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_comments.inc.php,v retrieving revision 1.17.2.4 retrieving revision 1.17.2.5 diff -u -d -r1.17.2.4 -r1.17.2.5 --- serendipity_admin_comments.inc.php 24 Sep 2004 22:03:18 -0000 1.17.2.4 +++ serendipity_admin_comments.inc.php 5 Oct 2004 19:40:39 -0000 1.17.2.5 @@ -87,7 +87,6 @@ 'timestamp' => time() ) ), - false, false ); |
|
From: Tom S. <tom...@us...> - 2004-10-05 19:41:41
|
Update of /cvsroot/php-blog/serendipity/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24698/templates/default Modified Files: Tag: branch-smarty entries.tpl Log Message: - Move the ability to toggle comments out of _printComments and into the templates, where it belongs Index: entries.tpl =================================================================== RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/entries.tpl,v retrieving revision 1.1.2.13 retrieving revision 1.1.2.14 diff -u -d -r1.1.2.13 -r1.1.2.14 --- entries.tpl 27 Sep 2004 12:13:51 -0000 1.1.2.13 +++ entries.tpl 5 Oct 2004 19:40:40 -0000 1.1.2.14 @@ -115,14 +115,22 @@ <a id="comments"></a> <div class="serendipity_commentsTitle">{$CONST.COMMENTS}</div> <div class="serendipity_center">{$CONST.DISPLAY_COMMENTS_AS} - {if $is_cview_linear} + {if $is_cview_linear} ({$CONST.COMMENTS_VIEWMODE_LINEAR} | <a href="{$serendipityHTTPPath}{$serendipityIndexFile}?url={$entry.commURL}&serendipity[cview]={$CONST.VIEWMODE_THREADED}#comments">{$CONST.COMMENTS_VIEWMODE_THREADED}</a>) - {else} + {else} (<a href="{$serendipityHTTPPath}{$serendipityIndexFile}?url={$entry.commURL}&serendipity[cview]={$CONST.VIEWMODE_LINEAR}#comments">{$CONST.COMMENTS_VIEWMODE_LINEAR}</a> | {$CONST.COMMENTS_VIEWMODE_THREADED}) - {/if} + {/if} </div> + {$COMMENTS} + {if $entry.is_entry_owner} + {if $entry.allow_comments} + <div class="serendipity_center">(<a href="{$entry.link_deny_comments}">{$CONST.COMMENTS_DISABLE}</a>)</div> + {else} + <div class="serendipity_center">(<a href="{$entry.link_allow_comments}">{$CONST.COMMENTS_ENABLE}</a>)</div> + {/if} + {/if} <a id="feedback"></a> {section name=message loop=$comments_messagestack} @@ -139,7 +147,7 @@ <br /> <div class="serendipity_center serendipity_msg_notice">{$CONST.COMMENT_ADDED}<br />{$CONST.THIS_COMMENT_NEEDS_REVIEW}</div> - {elseif $is_comment_closed} + {elseif not $entry.allow_comments} <br /> <div class="serendipity_center serendipity_msg_important">{$CONST.COMMENTS_CLOSED}</div> |
|
From: Tom S. <tom...@us...> - 2004-10-03 21:30:02
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3895 Modified Files: Tag: branch-smarty serendipity_functions.inc.php serendipity_sidebar_items.php Log Message: - Use a smaller and more pretty XML button - Align XML button correctly according to text Index: serendipity_sidebar_items.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v retrieving revision 1.84.2.4 retrieving revision 1.84.2.5 diff -u -d -r1.84.2.4 -r1.84.2.5 --- serendipity_sidebar_items.php 28 Sep 2004 15:52:53 -0000 1.84.2.4 +++ serendipity_sidebar_items.php 3 Oct 2004 21:27:53 -0000 1.84.2.5 @@ -528,48 +528,55 @@ if (serendipity_db_bool($this->get_config('show_0.91', true))) { ?> - <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" /></a> + <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> - <br /> + </div> <?php } if (serendipity_db_bool($this->get_config('show_1.0', true))) { ?> - <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" /></a> + <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> - <br /> + </div> <?php } if (serendipity_db_bool($this->get_config('show_2.0', true))) { ?> - <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" /></a> + <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> - <br /> + </div> <?php } if (serendipity_db_bool($this->get_config('show_atom0.3', true))) { ?> - <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" /></a> + <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> - <br /> + </div> <?php } if (serendipity_db_bool($this->get_config('show_2.0c', true))) { ?> - <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=2.0&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" /></a> + <div style="padding-bottom: 2px;"> + <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=2.0&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&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> - <br /> + </div> <?php } if (serendipity_db_bool($this->get_config('show_opml1.0', false))) { ?> - <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" /></a> + <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> + </div> <?php } } Index: serendipity_functions.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v retrieving revision 1.419.2.37 retrieving revision 1.419.2.38 diff -u -d -r1.419.2.37 -r1.419.2.38 --- serendipity_functions.inc.php 1 Oct 2004 18:32:42 -0000 1.419.2.37 +++ serendipity_functions.inc.php 3 Oct 2004 21:27:53 -0000 1.419.2.38 @@ -2381,8 +2381,10 @@ $category_id = serendipity_makeFilename($cat['category_name']); if (!empty($xmlImg)) { $ret .= sprintf( - '<a href="%s" title="%s"><img alt="xml" %s src="%s" /></a> %s' . - '<a href="%s" title="%s">%s</a><br />', + '<div style="padding-bottom: 2px;">' . + '<a href="%s" title="%s"><img alt="xml" %s src="%s" style="vertical-align: bottom" /></a> %s' . + '<a href="%s" title="%s">%s</a>' . + '</div>', $serendipity['serendipityHTTPPath'] . 'rss.php?category=' . $cat['categoryid'] . '_' . $category_id, htmlspecialchars($cat['category_description']), ($serendipity['XHTML11'] ? 'style="display: inline; border: 0px"' : 'border="0"'), |
|
From: Tom S. <tom...@us...> - 2004-10-03 21:29:24
|
Update of /cvsroot/php-blog/serendipity/templates/default/img In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3895/templates/default/img Modified Files: Tag: branch-smarty xml.gif Log Message: - Use a smaller and more pretty XML button - Align XML button correctly according to text Index: xml.gif =================================================================== RCS file: /cvsroot/php-blog/serendipity/templates/default/img/xml.gif,v retrieving revision 1.1 retrieving revision 1.1.6.1 diff -u -d -r1.1 -r1.1.6.1 Binary files /tmp/cvs3tpKZl and /tmp/cvs0p97Nq differ |
|
From: Tom S. <tom...@us...> - 2004-10-03 21:17:47
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1025 Modified Files: serendipity_functions.inc.php Log Message: Hrm, apparently that broke RSS syndication... revert Index: serendipity_functions.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v retrieving revision 1.436 retrieving revision 1.437 diff -u -d -r1.436 -r1.437 --- serendipity_functions.inc.php 3 Oct 2004 21:14:46 -0000 1.436 +++ serendipity_functions.inc.php 3 Oct 2004 21:16:23 -0000 1.437 @@ -2767,7 +2767,7 @@ $ret .= sprintf( '<a href="%s" title="%s"><img alt="xml" %s src="%s" /></a> %s' . '<a href="%s" title="%s">%s</a><br />', - $serendipity['serendipityHTTPPath'] . 'rss.php?category=' . $cat['categoryid'] . '-' . $category_id, + $serendipity['serendipityHTTPPath'] . 'rss.php?category=' . $cat['categoryid'] . '_' . $category_id, htmlspecialchars($cat['category_description']), ($serendipity['XHTML11'] ? 'style="display: inline; border: 0px"' : 'border="0"'), $xmlImg, |
|
From: Tom S. <tom...@us...> - 2004-10-03 21:16:23
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv718 Modified Files: serendipity_functions.inc.php Log Message: - Damn, forgot this one Index: serendipity_functions.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v retrieving revision 1.435 retrieving revision 1.436 diff -u -d -r1.435 -r1.436 --- serendipity_functions.inc.php 28 Sep 2004 15:53:07 -0000 1.435 +++ serendipity_functions.inc.php 3 Oct 2004 21:14:46 -0000 1.436 @@ -2767,7 +2767,7 @@ $ret .= sprintf( '<a href="%s" title="%s"><img alt="xml" %s src="%s" /></a> %s' . '<a href="%s" title="%s">%s</a><br />', - $serendipity['serendipityHTTPPath'] . 'rss.php?category=' . $cat['categoryid'] . '_' . $category_id, + $serendipity['serendipityHTTPPath'] . 'rss.php?category=' . $cat['categoryid'] . '-' . $category_id, htmlspecialchars($cat['category_description']), ($serendipity['XHTML11'] ? 'style="display: inline; border: 0px"' : 'border="0"'), $xmlImg, @@ -3647,4 +3647,4 @@ define("serendipity_FUNCTIONS_LOADED", true); /* vim: set sts=4 ts=4 expandtab : */ -?> \ No newline at end of file +?> |
|
From: Tom S. <tom...@us...> - 2004-10-03 00:45:34
|
Update of /cvsroot/php-blog/serendipity/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6878 Modified Files: Tag: branch-smarty trackbacks.tpl Log Message: - Tweak template code Index: trackbacks.tpl =================================================================== RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/trackbacks.tpl,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -u -d -r1.1.2.6 -r1.1.2.7 --- trackbacks.tpl 23 Sep 2004 15:49:59 -0000 1.1.2.6 +++ trackbacks.tpl 3 Oct 2004 00:45:16 -0000 1.1.2.7 @@ -1,20 +1,9 @@ {foreach from=$trackbacks item=trackback} - {if empty($trackback.url)} - {assign var="link" value=$trackback.email} - {else} - {assign var="link" value=$trackback.url} - {/if} - - {if empty($trackback.author)} - {assign var="name" value=$CONST.ANONYMOUS} - {else} - {assign var="name" value=$trackback.author} - {/if} <div class="serendipity_comment"> - <a href="{$link|@strip_tags}" {'blank'|@xhtml_target}>{$title}</a><br /> + <a href="{$trackback.url|@strip_tags}" {'blank'|@xhtml_target}>{$trackback.title}</a><br /> {$trackback.body|@strip_tags|@escape:all}<br /> <div class="serendipity_comment_source"> - <b>Weblog:</b> {$name|@strip_tags}<br /> + <b>Weblog:</b> {$trackback.author|@default:$CONST.ANONYMOUS}<br /> <b>{$CONST.TRACKED}:</b> {$trackback.timestamp|@formatTime:'%b %d, %H:%M'} {if $is_trackbacks_owner} (<a href="{$serendipityBaseURL}comment.php?serendipity[delete]={$trackback.id}&serendipity[entry]={$trackback.entry_id}&serendipity[type]=trackbacks">{$CONST.DELETE}</a>) |
|
From: Tom S. <tom...@us...> - 2004-10-01 18:32:52
|
Update of /cvsroot/php-blog/serendipity/templates/default/img In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2427/templates/default/img Modified Files: Tag: branch-smarty graph_bar_horisontal.png Log Message: - Convert the archive to Smarty, which includes partial rewrite - Change graphic for graph to something that goes with the theme Index: graph_bar_horisontal.png =================================================================== RCS file: /cvsroot/php-blog/serendipity/templates/default/img/graph_bar_horisontal.png,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -d -r1.1 -r1.1.2.1 Binary files /tmp/cvsBkEpxn and /tmp/cvs5Fj8R5 differ |
|
From: Tom S. <tom...@us...> - 2004-10-01 18:32:51
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2427 Modified Files: Tag: branch-smarty serendipity_functions.inc.php Log Message: - Convert the archive to Smarty, which includes partial rewrite - Change graphic for graph to something that goes with the theme Index: serendipity_functions.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v retrieving revision 1.419.2.36 retrieving revision 1.419.2.37 diff -u -d -r1.419.2.36 -r1.419.2.37 --- serendipity_functions.inc.php 28 Sep 2004 11:00:40 -0000 1.419.2.36 +++ serendipity_functions.inc.php 1 Oct 2004 18:32:42 -0000 1.419.2.37 @@ -3105,105 +3105,56 @@ } } -/* -* Amount of posts for given year & month -*/ -function serendipity_postAmount($year, $month) { - global $serendipity; - - $s = mktime(0, 0, 0, $month, 1, $year); - $e = mktime(23, 59, 59, $month, date('t', $s), $year); - $querystring = "SELECT count(id) FROM {$serendipity['dbPrefix']}entries WHERE isdraft = 'false' AND timestamp >= $s AND timestamp <= $e"; - $query = serendipity_db_query($querystring); - - return $query[0][0]; -} - -/* -* Print the archive -*/ function serendipity_printArchives() { global $serendipity; - echo '<div class="serendipity_date">' . ARCHIVES . '</div>'; - $f = serendipity_db_query("SELECT timestamp FROM {$serendipity['dbPrefix']}entries ORDER BY timestamp ASC LIMIT 1"); - $lastYear = date('Y', $f[0][0]); - $lastMonth= date('m', $f[0]); - $currYear = date('Y'); - $max = 0; + $lastYear = date('Y', $f[0][0]); + $lastMonth = date('m', $f[0][0]); + $thisYear = date('Y'); + $thisMonth = date('m'); + $max = 0; - while($currYear >= $lastYear) { - // echo "<h2>$currYear</h2><div class='serendipity_entry'>"; - for($x=1; $x<13; $x++) { - $entries = serendipity_postAmount($currYear, $x); - if ($entries > 0) { - $a = "<a href='". serendipity_archiveDateUrl($currYear . sprintf('%02s', $x)) . '\'>'; - $b = '</a>'; - $c = "<a href='". serendipity_archiveDateUrl($currYear . sprintf('%02s', $x), true) . '\'>'; - $d = "<a href='". serendipity_archiveDateUrl($currYear . sprintf('%02s', $x)) . '\'>'; - } else { - $a = $c = '<span style="color: #CDCDCD">'; - $b = $d = '</span>'; - } + $output = array(); + for ( $y = $thisYear; $y >= $lastYear; $y--) { + $output[$y]['year'] = $y; + for( $m=12; $m>=1; $m-- ) { - if ($x <= date('m') || $currYear < date('Y')) { - $out[$currYear][$x] = array($entries, $a, $b, $c, $d); + /* If the month we are checking are in the future, we drop it */ + if ( $m > $thisMonth && $y == $thisYear ) { + continue; } - if ($entries > $max) { - $max = $entries; + /* If the month is lower than the lowest month containing entries, we're done */ + if ( $m < $lastMonth && $y <= $lastYear ) { + break; } - } - // echo "</div>"; - $currYear--; - } - if (!$max) { - return; - } - - $barwidth = 40; - $fac = $barwidth/$max; -?> -<table cellspacing="0" width="500"> -<?php - foreach($out as $year => $months) { -?> - <tr> - <td colspan="6"><h2><?php echo $year; ?></h2></td> - </tr> -<?php - for($y=12; $y>0; $y--) { - if (isset($months[$y]) && $months[$y]) { - $time = mktime(0,0,0, $y+1, 0, $year); -?> - <tr> - <td> - <img src="<?php echo serendipity_getTemplateFile('img/graph_bar_horisontal.png') ?>" height="10" width="<?php echo ceil($months[$y][0]*$fac); ?>" hspace="0" vspace="0" alt="" /><img src="<?php echo serendipity_getTemplateFile('img/blank.png') ?>" height="10" width="<?php echo ($barwidth-ceil($months[$y][0]*$fac)); ?>" hspace="0" vspace="0" alt="" /> - </td> - <td> - <?php echo $months[$y][1] . serendipity_formatTime('%B', $time) . $months[$y][2]; ?> - </td> - <td> - <?php echo $months[$y][0] . ' ' . ENTRIES; ?> - </td> - - <td> - (<?php echo $months[$y][1] . VIEW_FULL . $months[$y][2]; ?>) - </td> + $s = mktime(0, 0, 0, $m, 1, $y); + $e = mktime(23, 59, 59, $m, date('t', $s), $y); + $entries = serendipity_db_query("SELECT count(id) FROM {$serendipity['dbPrefix']}entries + WHERE isdraft = 'false' + AND timestamp >= $s + AND timestamp <= $e"); + $entry_count = $entries[0][0]; - <td> - (<?php echo $months[$y][3] . VIEW_TOPICS . $months[$y][4]; ?>) - </td> - </tr> -<?php + /* A silly hack to get the maximum amount of entries per month */ + if ( $entry_count > $max ) { + $max = $entry_count; } + + $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['date'] = $s; + $output[$y]['months'][] = $data; } } -?> -</table> -<?php + $serendipity['smarty']->assign(array('archives' => $output, + 'max_entries' => $max)); + + serendipity_smarty_fetch('ARCHIVES', 'entries_archives.tpl', true); } function serendipity_xhtml_target($target) @@ -3335,4 +3286,4 @@ define("serendipity_FUNCTIONS_LOADED", true); /* vim: set sts=4 ts=4 expandtab : */ -?> \ No newline at end of file +?> |
|
From: Tom S. <tom...@us...> - 2004-10-01 18:32:51
|
Update of /cvsroot/php-blog/serendipity/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2427/templates/default Modified Files: Tag: branch-smarty content.tpl Added Files: Tag: branch-smarty entries_archives.tpl Log Message: - Convert the archive to Smarty, which includes partial rewrite - Change graphic for graph to something that goes with the theme --- NEW FILE: entries_archives.tpl --- {foreach from=$archives item="archive"} <table cellspacing="4" cellpadding="4" border="0"> <tr> <td colspan="4"><h2>{$archive.year}</h2></td> </tr> {foreach from=$archive.months item="month"} <tr> <td width="100"><img src="{serendipity_getFile file="img/graph_bar_horisontal.png"}" height="10" width="{math width=100 equation="count * width / max" count=$month.entry_count max=$max_entries format="%d"}" style="border: 1px solid #000000"></td> <td>{$month.date|@formatTime:"%B"}</td> <td>{$month.entry_count} {$CONST.ENTRIES}</td> <td>({if $month.entry_count}<a href="{$month.link}">{/if}{$CONST.VIEW_FULL}{if $month.entry_count}</a>{/if})</td> <td>({if $month.entry_count}<a href="{$month.link_summary}">{/if}{$CONST.VIEW_TOPICS}{if $month.entry_count}</a>{/if})</td> </tr> {/foreach} </table> {/foreach} Index: content.tpl =================================================================== RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/content.tpl,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 --- content.tpl 9 Sep 2004 15:00:45 -0000 1.1.2.1 +++ content.tpl 1 Oct 2004 18:32:42 -0000 1.1.2.2 @@ -2,5 +2,6 @@ {$content_message} {$ENTRIES} +{$ARCHIVES} -<!-- CONTENT END --> \ No newline at end of file +<!-- CONTENT END --> |
|
From: Tom S. <tom...@us...> - 2004-10-01 16:51:42
|
Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_textile In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15610 Modified Files: Tag: branch-smarty textile.php Log Message: MFH Index: textile.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_textile/textile.php,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -d -r1.4 -r1.4.2.1 --- textile.php 14 Jun 2004 11:45:33 -0000 1.4 +++ textile.php 1 Oct 2004 16:51:32 -0000 1.4.2.1 @@ -1094,4 +1094,3 @@ return $textile_arr; } ?> - |
|
From: Tom S. <tom...@us...> - 2004-10-01 16:50:56
|
Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_textile In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15202 Modified Files: textile.php Log Message: - Remove silly newline, which broke header() calls. Thanks FChE Index: textile.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_textile/textile.php,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- textile.php 14 Jun 2004 11:45:33 -0000 1.4 +++ textile.php 1 Oct 2004 16:50:46 -0000 1.5 @@ -1094,4 +1094,3 @@ return $textile_arr; } ?> - |
|
From: Jannis H. <jhe...@us...> - 2004-10-01 15:47:32
|
Update of /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_history In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32702/plugins/serendipity_plugin_history Modified Files: serendipity_plugin_history.php Log Message: Will I ever get it right? Index: serendipity_plugin_history.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_history/serendipity_plugin_history.php,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- serendipity_plugin_history.php 28 Sep 2004 18:38:24 -0000 1.13 +++ serendipity_plugin_history.php 1 Oct 2004 15:47:23 -0000 1.14 @@ -174,31 +174,31 @@ $dateformat = $this->get_config('dateformat'); $full = ($this->get_config('full', 'false') != 'true') ? false : true; - if (!$min_age || !is_numeric($min_age) || $min_age < 1 || $specialage == 'year') { + if (!is_numeric($min_age) || $min_age < 0 || $specialage == 'year') { $min_age = 365 + date('L'); } - if (!$max_age || !is_numeric($max_age) || $max_age < 1 || $specialage == 'year') { + if (!is_numeric($max_age) || $max_age < 1 || $specialage == 'year') { $max_age = 365 + date('L'); } - if (!$max_entries || !is_numeric($max_entries) || $max_entries < 1) { + if (!is_numeric($max_entries) || $max_entries < 1) { $max_entries = 5; } - if (!$maxlength ||!is_numeric($maxlength) ||$maxlength <0) + if (!is_numeric($maxlength) ||$maxlength <0) $maxlength = 30; - if (!$dateformat || strlen($dateformat) < 1) { + if (strlen($dateformat) < 1) { $dateformat = '%a, %d.%m.%Y %H:%M'; } $maxts = mktime(23, 59, 59, date('m'), date('d'), date('Y')); $mints = mktime(0, 0, 0, date('m'), date('d'), date('Y')); - $e = serendipity_fetchEntries(array(($mints-$min_age*86400), - ($maxts-$max_age*86400)), $full, 15); + $e = serendipity_fetchEntries(array(($mints-$max_age*86400), + ($maxts-$min_age*86400)), $full, $max_entries); echo (empty($intro)) ? '' : "$intro<br />"; - + if (!is_array($e)) return false; $e_c = @count($e); if ($e_c==0) return false; |
|
From: Sebastian N. <no...@us...> - 2004-10-01 14:26:21
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16022 Modified Files: Tag: branch-smarty 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.10 retrieving revision 1.93.2.11 diff -u -d -r1.93.2.10 -r1.93.2.11 --- serendipity_config.inc.php 25 Sep 2004 23:29:19 -0000 1.93.2.10 +++ serendipity_config.inc.php 1 Oct 2004 14:26:11 -0000 1.93.2.11 @@ -72,7 +72,7 @@ /* URI patterns * Note that it's important to use @ as the pattern delimiter. */ -@define('PAT_FILENAME', '0-9a-z\.\_!%;,\+\-'); +@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]+)@'); |
|
From: Sebastian N. <no...@us...> - 2004-10-01 14:23:57
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15536 Modified Files: serendipity_config.inc.php Log Message: "%" in URLs is bad as it is a special character. Working example of what can happen: http://blog.agrovibes.de/archives/97-31%-aller-Deutschen-bereits-total-verbloedet.html Index: serendipity_config.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v retrieving revision 1.95 retrieving revision 1.96 diff -u -d -r1.95 -r1.96 --- serendipity_config.inc.php 16 Sep 2004 13:53:04 -0000 1.95 +++ serendipity_config.inc.php 1 Oct 2004 14:23:45 -0000 1.96 @@ -71,7 +71,7 @@ /* URI patterns * Note that it's important to use @ as the pattern delimiter. */ -@define('PAT_FILENAME', '0-9a-z\.\_!%;,\+\-'); +@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]+)@'); |
|
From: Tom S. <tom...@us...> - 2004-09-30 18:05:54
|
Update of /cvsroot/php-blog/serendipity/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20102/templates/default Modified Files: Tag: branch-smarty index.tpl Log Message: - Don't manipulate core configuration variables, like blogTitle Index: index.tpl =================================================================== RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/index.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 --- index.tpl 30 Sep 2004 17:34:39 -0000 1.1.2.5 +++ index.tpl 30 Sep 2004 18:05:45 -0000 1.1.2.6 @@ -9,7 +9,7 @@ {if $is_embedded != true} <html> <head> - <title>{$head_title}</title> + <title>{$head_title|@default:$blogTitle} {if $head_subtitle} - {$head_subtitle}{/if}</title> <meta http-equiv="Content-Type" content="text/html; charset={$head_charset}" /> <meta name="Powered-By" content="Serendipity v.{$head_version}" /> <link rel="stylesheet" type="text/css" href="{$serendipityHTTPPath}serendipity.css.php" /> @@ -29,12 +29,8 @@ {if $is_raw_mode != true} <div id="serendipity_banner"> - <h1><a class="homelink1" href="{$serendipityBaseURL}">{$blogTitle}</a></h1> -{if $blogSubTitle} - <h2><a class="homelink2" href="{$serendipityBaseURL}">{$blogSubTitle}</a></h2> -{elseif $blogDescription} - <h2><a class="homelink2" href="{$serendipityBaseURL}">{$blogDescription}</a></h2> -{/if} + <h1><a class="homelink1" href="{$serendipityBaseURL}">{$head_title|@default:$blogTitle}</a></h1> + <h2><a class="homelink2" href="{$serendipityBaseURL}">{$head_subtitle|@default:$blogDescription}</a></h2> </div> <table id="mainpane"> |
|
From: Tom S. <tom...@us...> - 2004-09-30 18:05:54
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20102 Modified Files: Tag: branch-smarty index.php serendipity_genpage.inc.php Log Message: - Don't manipulate core configuration variables, like blogTitle Index: serendipity_genpage.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_genpage.inc.php,v retrieving revision 1.33.2.8 retrieving revision 1.33.2.9 diff -u -d -r1.33.2.8 -r1.33.2.9 --- serendipity_genpage.inc.php 19 Sep 2004 20:06:36 -0000 1.33.2.8 +++ serendipity_genpage.inc.php 30 Sep 2004 18:05:44 -0000 1.33.2.9 @@ -14,7 +14,6 @@ $serendipity['smarty']->assign( array( - 'head_title' => htmlspecialchars($serendipity['blogTitle']) . (isset($serendipity['blogSubTitle']) ? ' - '. htmlspecialchars($serendipity['blogSubTitle']) : ''), 'head_charset' => LANG_CHARSET, 'head_version' => $serendipity['version'], 'CONST' => get_defined_constants(), Index: index.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/index.php,v retrieving revision 1.49.2.4 retrieving revision 1.49.2.5 diff -u -d -r1.49.2.4 -r1.49.2.5 --- index.php 27 Sep 2004 12:13:49 -0000 1.49.2.4 +++ index.php 30 Sep 2004 18:05:44 -0000 1.49.2.5 @@ -1,5 +1,7 @@ <?php # $Id$ +#apd_set_pprof_trace(); + function microtime_float() { list($usec, $sec) = explode(" ", microtime()); @@ -64,7 +66,8 @@ $date = serendipity_formatTime(DATE_FORMAT_ENTRY, strtotime($range)); } - $serendipity['blogSubTitle'] = sprintf(ENTRIES_FOR, $date); + $serendipity['smarty']->assign('head_subtitle', sprintf(ENTRIES_FOR, $date)); + ob_start(); include_once(S9Y_INCLUDE_PATH . 'serendipity_genpage.inc.php'); $data = ob_get_contents(); @@ -89,7 +92,8 @@ $date = date('d/m/Y', strtotime($range)); } - $serendipity['blogSubTitle'] = sprintf(ENTRIES_FOR, $date); + $serendipity['smarty']->assign('head_subtitle', sprintf(ENTRIES_FOR, $date)); + ob_start(); include_once(S9Y_INCLUDE_PATH . 'serendipity_genpage.inc.php'); $data = ob_get_contents(); @@ -135,8 +139,7 @@ $title = serendipity_db_query("SELECT title FROM {$serendipity['dbPrefix']}entries WHERE id=$id", true); $title = $title[0]; - $serendipity['blogSubTitle'] = $serendipity['blogTitle']; - $serendipity['blogTitle'] = $title; + $serendipity['smarty']->assign(array('head_title' => $title, 'head_subtitle' => $serendipity['blogTitle'])); ob_start(); include_once(S9Y_INCLUDE_PATH . 'serendipity_genpage.inc.php'); @@ -229,5 +232,6 @@ $serendipity['smarty']->display(serendipity_getTemplateFile($serendipity['smarty_file'], 'serendipityPath')); echo '<center style="color: red; font-size: large">Process complete in '. (microtime_float()-$time_start) .' ms</center>'; +# serendipity_plugin_api::register_default_plugins(); /* vim: set sts=4 ts=4 expandtab : */ ?> |
|
From: Tom S. <tom...@us...> - 2004-09-30 17:34:48
|
Update of /cvsroot/php-blog/serendipity/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13340 Modified Files: Tag: branch-smarty index.tpl Log Message: - Call the RSS feeds something pretty Index: index.tpl =================================================================== RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/index.tpl,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -d -r1.1.2.4 -r1.1.2.5 --- index.tpl 30 Sep 2004 17:31:40 -0000 1.1.2.4 +++ index.tpl 30 Sep 2004 17:34:39 -0000 1.1.2.5 @@ -13,8 +13,8 @@ <meta http-equiv="Content-Type" content="text/html; charset={$head_charset}" /> <meta name="Powered-By" content="Serendipity v.{$head_version}" /> <link rel="stylesheet" type="text/css" href="{$serendipityHTTPPath}serendipity.css.php" /> - <link rel="alternate" type="application/rss+xml" title="RSS" href="{$serendipityBaseURL}{$serendipityRewritePrefix}feeds/index.rss2" /> - <link rel="alternate" type="application/x.atom+xml" title="Atom" href="{$serendipityBaseURL}{$serendipityRewritePrefix}feeds/atom.xml" /> + <link rel="alternate" type="application/rss+xml" title="{$blogTitle} RSS feed" href="{$serendipityBaseURL}{$serendipityRewritePrefix}feeds/index.rss2" /> + <link rel="alternate" type="application/x.atom+xml" title="{$blogTitle} Atom feed" href="{$serendipityBaseURL}{$serendipityRewritePrefix}feeds/atom.xml" /> {if $entry_id} <link rel="pingback" href="{$serendipityBaseURL}comment.php?type=pingback&entry_id={$entry_id}" /> {/if} |
|
From: Tom S. <tom...@us...> - 2004-09-30 17:31:49
|
Update of /cvsroot/php-blog/serendipity/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12804 Modified Files: Tag: branch-smarty index.tpl Log Message: MFH, ref: jannis Index: index.tpl =================================================================== RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/index.tpl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -d -r1.1.2.3 -r1.1.2.4 --- index.tpl 19 Sep 2004 20:06:36 -0000 1.1.2.3 +++ index.tpl 30 Sep 2004 17:31:40 -0000 1.1.2.4 @@ -1,6 +1,6 @@ {if $is_xhtml} <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/xhtml1-transitional.dtd"> + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> {else} <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> |
|
From: Jannis H. <jhe...@us...> - 2004-09-30 13:39:50
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31289 Modified Files: serendipity_genpage.inc.php Log Message: fixed wrong dtd uri Index: serendipity_genpage.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_genpage.inc.php,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- serendipity_genpage.inc.php 27 Jul 2004 21:02:17 -0000 1.33 +++ serendipity_genpage.inc.php 30 Sep 2004 13:39:40 -0000 1.34 @@ -4,7 +4,7 @@ if ($serendipity['XHTML11']) { ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/xhtml1-transitional.dtd"> + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <?php } else { ?> |
|
From: Tom S. <tom...@us...> - 2004-09-28 21:11:42
|
Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15961 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.17 retrieving revision 1.4.2.18 diff -u -d -r1.4.2.17 -r1.4.2.18 --- serendipity_event_spamblock.php 28 Sep 2004 11:00:46 -0000 1.4.2.17 +++ serendipity_event_spamblock.php 28 Sep 2004 21:11:33 -0000 1.4.2.18 @@ -154,7 +154,7 @@ $propbag->add('type', 'string'); $propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_LOGFILE); $propbag->add('description', PLUGIN_EVENT_SPAMBLOCK_LOGFILE_DESC); - $propbag->add('default', $serendipity['serendipityPath'] . 'spamblock_captcha.log'); + $propbag->add('default', $serendipity['serendipityPath'] . 'spamblock.log'); break; case 'ipflood': @@ -254,7 +254,8 @@ case 'frontend_saveComment': if (!is_array($eventData) || serendipity_db_bool($eventData['allow_comments'])) { $serendipity['csuccess'] = 'true'; - $logfile = $this->get_config('logfile', $serendipity['serendipityPath'] . 'spamblock_captcha.log'); + $logfile = $this->get_config('logfile', $serendipity['serendipityPath'] . 'spamblock.log'); + if ( $this->get_config('killswitch', false) === true ) { $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_REASON_KILLSWITCH, $addData); $eventData = array('allow_comments' => false); @@ -512,4 +513,4 @@ } /* vim: set sts=4 ts=4 expandtab : */ -?> \ No newline at end of file +?> |
|
From: Tom S. <tom...@us...> - 2004-09-28 21:10:25
|
Update of /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_history In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15589 Modified Files: Tag: branch-smarty serendipity_plugin_history.php Log Message: MFH Index: serendipity_plugin_history.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_history/serendipity_plugin_history.php,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -u -d -r1.11 -r1.11.2.1 --- serendipity_plugin_history.php 24 Aug 2004 17:33:04 -0000 1.11 +++ serendipity_plugin_history.php 28 Sep 2004 21:10:01 -0000 1.11.2.1 @@ -193,10 +193,10 @@ $dateformat = '%a, %d.%m.%Y %H:%M'; } - $mints = mktime(23, 59, 59, date('m'), date('d'), date('Y')); - $maxts = mktime(0, 0, 0, date('m'), date('d'), date('Y')); - $e = serendipity_fetchEntries(array(($maxts-$max_age*86400), - ($mints-$min_age*86400)), $full, 15); + $maxts = mktime(23, 59, 59, date('m'), date('d'), date('Y')); + $mints = mktime(0, 0, 0, date('m'), date('d'), date('Y')); + $e = serendipity_fetchEntries(array(($mints-$min_age*86400), + ($maxts-$max_age*86400)), $full, 15); echo (empty($intro)) ? '' : "$intro<br />"; if (!is_array($e)) return false; |
|
From: Tom S. <tom...@us...> - 2004-09-28 21:07:22
|
Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14933 Modified Files: serendipity_event_spamblock.php Log Message: - Why call it captcha, it logs everything aswell? Index: serendipity_event_spamblock.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- serendipity_event_spamblock.php 28 Sep 2004 11:00:55 -0000 1.21 +++ serendipity_event_spamblock.php 28 Sep 2004 21:07:12 -0000 1.22 @@ -154,7 +154,7 @@ $propbag->add('type', 'string'); $propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_LOGFILE); $propbag->add('description', PLUGIN_EVENT_SPAMBLOCK_LOGFILE_DESC); - $propbag->add('default', $serendipity['serendipityPath'] . 'spamblock_captcha.log'); + $propbag->add('default', $serendipity['serendipityPath'] . 'spamblock.log'); break; case 'ipflood': @@ -254,7 +254,8 @@ case 'frontend_saveComment': if (!is_array($eventData) || serendipity_db_bool($eventData['allow_comments'])) { $serendipity['csuccess'] = 'true'; - $logfile = $this->get_config('logfile', $serendipity['serendipityPath'] . 'spamblock_captcha.log'); + $logfile = $this->get_config('logfile', $serendipity['serendipityPath'] . 'spamblock.log'); + if ( $this->get_config('killswitch', false) === true ) { $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_REASON_KILLSWITCH, $addData); $eventData = array('allow_comments' => false); @@ -512,4 +513,4 @@ } /* vim: set sts=4 ts=4 expandtab : */ -?> \ No newline at end of file +?> |
