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
(23) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Garvin H. <gar...@us...> - 2004-09-27 10:15:47
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15527 Modified Files: serendipity_admin_interop.inc.php serendipity_rss_exchange.inc.php Log Message: fixed rss import logic, added new option Index: serendipity_rss_exchange.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_rss_exchange.inc.php,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- serendipity_rss_exchange.inc.php 13 Jul 2004 08:49:41 -0000 1.5 +++ serendipity_rss_exchange.inc.php 27 Sep 2004 10:15:37 -0000 1.6 @@ -6,21 +6,26 @@ { global $serendipity; - $entry = array(); + $entry = array(); + $bodyonly = (isset($serendipity['POST']['bodyonly']) && $serendipity['POST']['bodyonly'] == 'true' ? true : false); if ($item['description']) { $entry['body'] = $item['description']; } if ($item['content:encoded']) { - if (!isset($entry['body'])) { + if (!isset($entry['body']) || $bodyonly) { $data = &$entry['body']; } else { $data = &$entry['extended']; } + // See if the 'description' element is a substring of the 'content:encoded' part. If it is, + // we will only fetch the full 'content:encoded' part. If it's not a substring, we append + // the 'content:encoded' part to either body or extended entry (respecting the 'bodyonly' + // switch). if ($entry['body'] != substr($item['content:encoded'], 0, strlen($entry['body']))) { - $data .= substr($item['content:encoded'], strlen($entry['body'])); + $data .= $item['content:encoded'];; } else { $data = $item['content:encoded']; } @@ -70,4 +75,4 @@ } /* vim: set sts=4 ts=4 expandtab : */ -?> +?> \ No newline at end of file Index: serendipity_admin_interop.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_interop.inc.php,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- serendipity_admin_interop.inc.php 13 Jul 2004 08:49:41 -0000 1.7 +++ serendipity_admin_interop.inc.php 27 Sep 2004 10:15:24 -0000 1.8 @@ -40,7 +40,8 @@ <select name="serendipity[category]"> <option value="0">[ <?php echo NO_CATEGORY; ?> ]</option> <?php echo serendipity_generateCategoryList($cats, array(), 1); ?> - </select> + </select><br /> + <input type="checkbox" name="serendipity[bodyonly]" id="bodyonly" value="true" /><label for="bodylonly"><?php echo RSS_IMPORT_BODYONLY; ?></label><br /> <input type="submit" value="<?php echo IMPORT; ?> RSS" /> </div> |
Update of /cvsroot/php-blog/serendipity/lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14984/lang Modified Files: Tag: branch-smarty serendipity_lang_bg.inc.php serendipity_lang_cs.inc.php serendipity_lang_cz.inc.php serendipity_lang_da.inc.php serendipity_lang_de.inc.php serendipity_lang_en.inc.php serendipity_lang_es.inc.php serendipity_lang_fr.inc.php serendipity_lang_it.inc.php serendipity_lang_nl.inc.php serendipity_lang_no.inc.php serendipity_lang_pt.inc.php Log Message: Modified RSS import parser to respect putting import text only to a single field. Fixed buggy substr() logic. Someone care to test this with a 'live' import? Index: serendipity_lang_cs.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v retrieving revision 1.61.2.1 retrieving revision 1.61.2.2 diff -u -d -r1.61.2.1 -r1.61.2.2 --- serendipity_lang_cs.inc.php 24 Sep 2004 22:03:18 -0000 1.61.2.1 +++ serendipity_lang_cs.inc.php 27 Sep 2004 10:13:39 -0000 1.61.2.2 @@ -553,6 +553,7 @@ @define('COMMENTS_FILTER_ALL', 'All'); // Translate @define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate +@define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file Index: serendipity_lang_no.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_no.inc.php,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -d -r1.2.2.1 -r1.2.2.2 --- serendipity_lang_no.inc.php 14 Sep 2004 10:30:07 -0000 1.2.2.1 +++ serendipity_lang_no.inc.php 27 Sep 2004 10:13:40 -0000 1.2.2.2 @@ -544,6 +544,10 @@ @define('SIDEBAR_PLUGINS', 'Sidebar-plugins'); @define('EVENT_PLUGINS', 'Hendelses-lugins'); @define('ADD_MEDIA_BLAHBLAH', '<b>Legg til en fil til ditt mediabibliotek:</b><p>Her kan du laste opp mediafiler, eller be meg om å hente dem fra en adresse på nettet! Hvis du ikke har et passende bilde, <a href="http://images.google.com" target="_blank">søk etter bilder på Google</a> som passer til tankene dine. Resultatene er ofte nyttige og morsomme :)<p><b>Velg metode:</b><br>'); +@define('COMMENTS_FILTER_SHOW', 'Show'); // Translate +@define('COMMENTS_FILTER_ALL', 'All'); // Translate +@define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate +@define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate +@define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate - -?> +?> \ No newline at end of file Index: serendipity_lang_nl.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_nl.inc.php,v retrieving revision 1.36.2.1 retrieving revision 1.36.2.2 diff -u -d -r1.36.2.1 -r1.36.2.2 --- serendipity_lang_nl.inc.php 24 Sep 2004 22:03:19 -0000 1.36.2.1 +++ serendipity_lang_nl.inc.php 27 Sep 2004 10:13:40 -0000 1.36.2.2 @@ -558,6 +558,7 @@ @define('COMMENTS_FILTER_ALL', 'All'); // Translate @define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate +@define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file Index: serendipity_lang_en.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v retrieving revision 1.79.2.3 retrieving revision 1.79.2.4 diff -u -d -r1.79.2.3 -r1.79.2.4 --- serendipity_lang_en.inc.php 24 Sep 2004 22:03:19 -0000 1.79.2.3 +++ serendipity_lang_en.inc.php 27 Sep 2004 10:13:39 -0000 1.79.2.4 @@ -550,5 +550,6 @@ @define('COMMENTS_FILTER_ALL', 'All'); @define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); +@define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); /* vim: set sts=4 ts=4 expandtab : */ ?> Index: serendipity_lang_bg.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_bg.inc.php,v retrieving revision 1.15.2.1 retrieving revision 1.15.2.2 diff -u -d -r1.15.2.1 -r1.15.2.2 --- serendipity_lang_bg.inc.php 24 Sep 2004 22:03:18 -0000 1.15.2.1 +++ serendipity_lang_bg.inc.php 27 Sep 2004 10:13:39 -0000 1.15.2.2 @@ -535,6 +535,7 @@ @define('COMMENTS_FILTER_ALL', 'All'); // Translate @define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate +@define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file Index: serendipity_lang_pt.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_pt.inc.php,v retrieving revision 1.36.2.2 retrieving revision 1.36.2.3 diff -u -d -r1.36.2.2 -r1.36.2.3 --- serendipity_lang_pt.inc.php 24 Sep 2004 22:03:19 -0000 1.36.2.2 +++ serendipity_lang_pt.inc.php 27 Sep 2004 10:13:40 -0000 1.36.2.3 @@ -554,6 +554,7 @@ @define('COMMENTS_FILTER_ALL', 'All'); // Translate @define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate +@define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file Index: serendipity_lang_it.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_it.inc.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 --- serendipity_lang_it.inc.php 15 Sep 2004 11:20:42 -0000 1.1.2.1 +++ serendipity_lang_it.inc.php 27 Sep 2004 10:13:40 -0000 1.1.2.2 @@ -546,7 +546,11 @@ @define('COMMENTS_VIEWMODE_THREADED', 'Per argomento'); @define('COMMENTS_VIEWMODE_LINEAR', 'Cronologicamente'); @define('DISPLAY_COMMENTS_AS', 'Mostra commenti'); - +@define('COMMENTS_FILTER_SHOW', 'Show'); // Translate +@define('COMMENTS_FILTER_ALL', 'All'); // Translate +@define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate +@define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate +@define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); /* vim: set sts=4 ts=4 expandtab : */ -?> +?> \ No newline at end of file Index: serendipity_lang_da.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v retrieving revision 1.79.2.2 retrieving revision 1.79.2.3 diff -u -d -r1.79.2.2 -r1.79.2.3 --- serendipity_lang_da.inc.php 24 Sep 2004 22:03:18 -0000 1.79.2.2 +++ serendipity_lang_da.inc.php 27 Sep 2004 10:13:39 -0000 1.79.2.3 @@ -548,6 +548,7 @@ @define('COMMENTS_FILTER_ALL', 'All'); // Translate @define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate +@define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file Index: serendipity_lang_fr.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fr.inc.php,v retrieving revision 1.58.2.2 retrieving revision 1.58.2.3 diff -u -d -r1.58.2.2 -r1.58.2.3 --- serendipity_lang_fr.inc.php 24 Sep 2004 22:03:19 -0000 1.58.2.2 +++ serendipity_lang_fr.inc.php 27 Sep 2004 10:13:39 -0000 1.58.2.3 @@ -556,6 +556,7 @@ @define('COMMENTS_FILTER_ALL', 'All'); // Translate @define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate +@define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file Index: serendipity_lang_cz.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cz.inc.php,v retrieving revision 1.61.2.1 retrieving revision 1.61.2.2 diff -u -d -r1.61.2.1 -r1.61.2.2 --- serendipity_lang_cz.inc.php 24 Sep 2004 22:03:18 -0000 1.61.2.1 +++ serendipity_lang_cz.inc.php 27 Sep 2004 10:13:39 -0000 1.61.2.2 @@ -551,6 +551,7 @@ @define('COMMENTS_FILTER_ALL', 'All'); // Translate @define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate +@define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file Index: serendipity_lang_es.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v retrieving revision 1.77.2.1 retrieving revision 1.77.2.2 diff -u -d -r1.77.2.1 -r1.77.2.2 --- serendipity_lang_es.inc.php 24 Sep 2004 22:03:19 -0000 1.77.2.1 +++ serendipity_lang_es.inc.php 27 Sep 2004 10:13:39 -0000 1.77.2.2 @@ -557,6 +557,7 @@ @define('COMMENTS_FILTER_ALL', 'All'); // Translate @define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate +@define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file Index: serendipity_lang_de.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v retrieving revision 1.98.2.1 retrieving revision 1.98.2.2 diff -u -d -r1.98.2.1 -r1.98.2.2 --- serendipity_lang_de.inc.php 14 Sep 2004 10:30:07 -0000 1.98.2.1 +++ serendipity_lang_de.inc.php 27 Sep 2004 10:13:39 -0000 1.98.2.2 @@ -546,6 +546,11 @@ @define('COMMENTS_VIEWMODE_LINEAR', 'Linear'); @define('DISPLAY_COMMENTS_AS', 'Ansicht der Kommentare: '); @define('ADD_MEDIA_BLAHBLAH', '<b>Bild/Datei zur Sammlung hinzufügen:</b><p>Hier können Sie eine Datei (z.B. ein Bild) hochladen, oder mitteilen, von wo es geladen werden soll! Wenn das passende Bild fehlt, einfach bei Google danach suchen. Probieren Sie mal <a href="http://images.google.de" target="_blank">Googles Bildsuche</a>, die Resultate sind oft brauchbar, aber auf jeden Fall witzig :)<p><b>Methode wählen:</b><br>'); +@define('COMMENTS_FILTER_SHOW', 'Zeige'); +@define('COMMENTS_FILTER_ALL', 'Alle'); +@define('COMMENTS_FILTER_APPROVED_ONLY', 'Nur bewilligte'); +@define('COMMENTS_FILTER_NEED_APPROVAL', 'Zu bewilligende'); +@define('RSS_IMPORT_BODYONLY', 'Füge den gesamten importierten Text in das einzelne "Text"-Feld ein. Verhindert die Aufteilung in den "Erweiterten Eintrag"-Bereich.'); /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file |
|
From: Garvin H. <gar...@us...> - 2004-09-27 10:13:47
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14984 Modified Files: Tag: branch-smarty serendipity_admin_interop.inc.php serendipity_rss_exchange.inc.php Log Message: Modified RSS import parser to respect putting import text only to a single field. Fixed buggy substr() logic. Someone care to test this with a 'live' import? Index: serendipity_rss_exchange.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_rss_exchange.inc.php,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -d -r1.5 -r1.5.2.1 --- serendipity_rss_exchange.inc.php 13 Jul 2004 08:49:41 -0000 1.5 +++ serendipity_rss_exchange.inc.php 27 Sep 2004 10:13:39 -0000 1.5.2.1 @@ -6,21 +6,26 @@ { global $serendipity; - $entry = array(); + $entry = array(); + $bodyonly = (isset($serendipity['POST']['bodyonly']) && $serendipity['POST']['bodyonly'] == 'true' ? true : false); if ($item['description']) { $entry['body'] = $item['description']; } if ($item['content:encoded']) { - if (!isset($entry['body'])) { + if (!isset($entry['body']) || $bodyonly) { $data = &$entry['body']; } else { $data = &$entry['extended']; } + // See if the 'description' element is a substring of the 'content:encoded' part. If it is, + // we will only fetch the full 'content:encoded' part. If it's not a substring, we append + // the 'content:encoded' part to either body or extended entry (respecting the 'bodyonly' + // switch). if ($entry['body'] != substr($item['content:encoded'], 0, strlen($entry['body']))) { - $data .= substr($item['content:encoded'], strlen($entry['body'])); + $data .= $item['content:encoded'];; } else { $data = $item['content:encoded']; } @@ -70,4 +75,4 @@ } /* vim: set sts=4 ts=4 expandtab : */ -?> +?> \ No newline at end of file Index: serendipity_admin_interop.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_interop.inc.php,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -d -r1.7 -r1.7.2.1 --- serendipity_admin_interop.inc.php 13 Jul 2004 08:49:41 -0000 1.7 +++ serendipity_admin_interop.inc.php 27 Sep 2004 10:13:39 -0000 1.7.2.1 @@ -40,7 +40,8 @@ <select name="serendipity[category]"> <option value="0">[ <?php echo NO_CATEGORY; ?> ]</option> <?php echo serendipity_generateCategoryList($cats, array(), 1); ?> - </select> + </select><br /> + <input type="checkbox" name="serendipity[bodyonly]" id="bodyonly" value="true" /><label for="bodylonly"><?php echo RSS_IMPORT_BODYONLY; ?></label><br /> <input type="submit" value="<?php echo IMPORT; ?> RSS" /> </div> |
|
From: Garvin H. <gar...@us...> - 2004-09-27 09:12:39
|
Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv666 Modified Files: Tag: branch-smarty serendipity_event_spamblock.php Added Files: Tag: branch-smarty 36daysago.ttf 36daysago.txt Vera.ttf VeraSe.ttf chumbly.ttf chumbly.txt Removed Files: Tag: branch-smarty Impact.ttf Verdana.ttf Log Message: MFH fonts --- Impact.ttf DELETED --- --- NEW FILE: 36daysago.ttf --- (This appears to be a binary file; contents omitted.) --- Verdana.ttf DELETED --- --- NEW FILE: chumbly.txt --- (This appears to be a binary file; contents omitted.) --- NEW FILE: 36daysago.txt --- (This appears to be a binary file; contents omitted.) --- NEW FILE: chumbly.ttf --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Vera.ttf --- (This appears to be a binary file; contents omitted.) 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.14 retrieving revision 1.4.2.15 diff -u -d -r1.4.2.14 -r1.4.2.15 --- serendipity_event_spamblock.php 24 Sep 2004 10:36:53 -0000 1.4.2.14 +++ serendipity_event_spamblock.php 27 Sep 2004 09:12:29 -0000 1.4.2.15 @@ -366,7 +366,7 @@ $height = 40; $bgcolors = explode(',', $this->get_config('captcha_color', '255,255,255')); - $fontfiles = array('Comic_Sans_MS.ttf', 'Impact.ttf', 'Verdana.ttf'); + $fontfiles = array('Vera.ttf', 'VeraSe.ttf', 'chumbly.ttf', '36daysago.ttf'); if ($use_gd) { $strings = $this->random_string($max_char, $min_char); --- NEW FILE: VeraSe.ttf --- (This appears to be a binary file; contents omitted.) |
|
From: Garvin H. <gar...@us...> - 2004-09-27 09:12:07
|
Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv370 Modified Files: serendipity_event_spamblock.php Added Files: 36daysago.ttf 36daysago.txt Vera.ttf VeraSe.ttf chumbly.ttf chumbly.txt Removed Files: Impact.ttf Verdana.ttf Log Message: Use free-of-use fonts (Bitstream Vera in serif/non-serif, chumbly and 36daysago; including their respective license files) --- Impact.ttf DELETED --- --- NEW FILE: 36daysago.ttf --- (This appears to be a binary file; contents omitted.) --- Verdana.ttf DELETED --- --- NEW FILE: chumbly.txt --- (This appears to be a binary file; contents omitted.) --- NEW FILE: 36daysago.txt --- (This appears to be a binary file; contents omitted.) --- NEW FILE: chumbly.ttf --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Vera.ttf --- (This appears to be a binary file; contents omitted.) Index: serendipity_event_spamblock.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- serendipity_event_spamblock.php 24 Sep 2004 10:36:49 -0000 1.18 +++ serendipity_event_spamblock.php 27 Sep 2004 09:11:56 -0000 1.19 @@ -366,7 +366,7 @@ $height = 40; $bgcolors = explode(',', $this->get_config('captcha_color', '255,255,255')); - $fontfiles = array('Comic_Sans_MS.ttf', 'Impact.ttf', 'Verdana.ttf'); + $fontfiles = array('Vera.ttf', 'VeraSe.ttf', 'chumbly.ttf', '36daysago.ttf'); if ($use_gd) { $strings = $this->random_string($max_char, $min_char); --- NEW FILE: VeraSe.ttf --- (This appears to be a binary file; contents omitted.) |
|
From: Tom S. <tom...@us...> - 2004-09-26 20:57:17
|
Update of /cvsroot/php-blog/serendipity/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4721 Modified Files: Tag: branch-smarty entries.tpl Log Message: - Replace .entryLink with .link Index: entries.tpl =================================================================== RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/entries.tpl,v retrieving revision 1.1.2.11 retrieving revision 1.1.2.12 diff -u -d -r1.1.2.11 -r1.1.2.12 --- entries.tpl 26 Sep 2004 00:47:47 -0000 1.1.2.11 +++ entries.tpl 26 Sep 2004 20:57:07 -0000 1.1.2.12 @@ -52,7 +52,7 @@ {if $use_popups} | <a href="{$serendipityHTTPPath}comment.php?serendipity[entry_id]={$entry.id}&serendipity[type]=trackbacks" onclick="window.open(this.href, \'comments\', \'width=480,height=480,scrollbars=yes\'); return false;">{$entry.label_trackbacks} ({$entry.trackbacks})</a> {else} - | <a href="{$entry.entryLink}#trackbacks">{$entry.label_trackbacks} ({$entry.trackbacks})</a> + | <a href="{$entry.link}#trackbacks">{$entry.label_trackbacks} ({$entry.trackbacks})</a> {/if} {/if} |
|
From: Tom S. <tom...@us...> - 2004-09-26 20:51:55
|
Update of /cvsroot/php-blog/serendipity/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3497/templates/default Modified Files: Tag: branch-smarty entries_summary.tpl Log Message: - Fix entries_summary.tpl, and make it a little more pretty :) TODO: The top is still not showing the correct date, but I have a plan - I think Index: entries_summary.tpl =================================================================== RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/entries_summary.tpl,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -d -r1.1.2.2 -r1.1.2.3 --- entries_summary.tpl 23 Sep 2004 15:49:59 -0000 1.1.2.2 +++ entries_summary.tpl 26 Sep 2004 20:51:38 -0000 1.1.2.3 @@ -1,10 +1,12 @@ -<div class='serendipity_date'>{$CONST.TOPICS_OF} {$bydate[0][0].timestamp|@formatTime:"%B, %Y"}</div> +<div class='serendipity_date'>{$CONST.TOPICS_OF} {$entries.entries.date|@formatTime:"%B, %Y"}</div> <div class="serendipity_entry"> - {section name=date loop=$bydate} - {section name=x loop=$bydate[date]} - <a href="{$bydate[date][x].entryLink}">{$bydate[date][x].title}</a> - <br /> - {/section} - {/section} + {foreach from=$entries item="entries"} + <ul> + {foreach from=$entries.entries item="entry"} + <li><a href="{$entry.link}">{$entry.title}</a> + <br />{$CONST.POSTED_BY} {$entry.username} {$CONST.ON} {$entry.timestamp|@formatTime:DATE_FORMAT_ENTRY}</li> + {/foreach} + </ul> + {/foreach} </div> |
|
From: Tom S. <tom...@us...> - 2004-09-26 20:42:28
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1269 Modified Files: Tag: branch-smarty serendipity_functions.inc.php Log Message: - $ts is not used for anything, remove it - Don't date() when post is sticky Index: serendipity_functions.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v retrieving revision 1.419.2.33 retrieving revision 1.419.2.34 diff -u -d -r1.419.2.33 -r1.419.2.34 --- serendipity_functions.inc.php 26 Sep 2004 00:47:47 -0000 1.419.2.33 +++ serendipity_functions.inc.php 26 Sep 2004 20:42:18 -0000 1.419.2.34 @@ -933,12 +933,13 @@ $entries = array(); } - $dategroup = array(); + $dategroup = array(); for ($x = 0, $num_entries = count($entries); $x < $num_entries; $x++) { - $ts = $key = date('Ymd', $entries[$x]['timestamp']); if (!empty($entries[$x]['properties']['ep_is_sticky']) && serendipity_db_bool($entries[$x]['properties']['ep_is_sticky'])) { $entries[$x]['is_sticky'] = true; $key = 'sticky'; + } else { + $key = date('Ymd', $entries[$x]['timestamp']); } if (!empty($entries[$x]['properties']['ep_cache_body'])) { @@ -951,9 +952,9 @@ $entries[$x]['is_cached'] = true; } - $dategroup[$key]['date'] = $entries[$x]['timestamp']; - $dategroup[$key]['is_sticky'] = isset($entries[$x]['is_sticky']); - $dategroup[$key]['entries'][] = &$entries[$x]; + $dategroup[$key]['date'] = $entries[$x]['timestamp']; + $dategroup[$key]['is_sticky'] = isset($entries[$x]['is_sticky']); + $dategroup[$key]['entries'][] = &$entries[$x]; } foreach($dategroup as $properties) { |
|
From: Tom S. <tom...@us...> - 2004-09-26 00:48:01
|
Update of /cvsroot/php-blog/serendipity/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12960/templates/default Modified Files: Tag: branch-smarty entries.tpl Log Message: - Replace some of this $bydate etc. logic, since it's really unnecessary and bad for performance TODO: Fix entries_summary.tpl - Don't attempt to show category images, if there are none Index: entries.tpl =================================================================== RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/entries.tpl,v retrieving revision 1.1.2.10 retrieving revision 1.1.2.11 diff -u -d -r1.1.2.10 -r1.1.2.11 --- entries.tpl 23 Sep 2004 15:49:59 -0000 1.1.2.10 +++ entries.tpl 26 Sep 2004 00:47:47 -0000 1.1.2.11 @@ -1,64 +1,66 @@ <!-- ENTRIES START --> - {section name=date loop=$bydate} + {foreach from=$entries item="dategroup"} <div class="serendipity_Entry_Date"> - {if $dateref[date] eq 'sticky'} + {if $dategroup.is_sticky} <h3 class="serendipity_date">STICKY POSTINGS</h3> {else} - <h3 class="serendipity_date">{$dateref[date]|@formatTime:DATE_FORMAT_ENTRY}</h3> + <h3 class="serendipity_date">{$dategroup.date|@formatTime:DATE_FORMAT_ENTRY}</h3> {/if} - {section name=x loop=$bydate[date]} - <h4 class="serendipity_title"><a href="{$bydate[date][x].entryLink}">{$bydate[date][x].title}</a></h4> + {foreach from=$dategroup.entries item="entry"} + <h4 class="serendipity_title"><a href="{$entry.link}">{$entry.title}</a></h4> <div class="serendipity_entry"> - {if is_array($bydate[date][x][categories])} + {if $entry.categories} <span class="serendipity_entryIcon"> - {section name=cat loop=$bydate[date][x][categories]} - <a href="{$serendipityHTTPPath}{$serendipityRewritePrefix}{$CONST.PATH_CATEGORIES}/{$bydate[date][x][categories].categoryid}-{$bydate[date][x][categories].category_name|@makeFilename}"><img class="serendipity_entryIcon" title="{$bydate[date][x][categories].category_name|@escape}{$bydate[date][x][categories].category_description|@emptyPrefix}" alt="{$bydate[date][x][categories].category_name|@escape}" src="{$bydate[date][x][categories].category_icon}" /></a> - {/section} + {foreach from=$entry.categories item="category"} + {if $category.category_icon} + <a href="{$serendipityHTTPPath}{$serendipityRewritePrefix}{$CONST.PATH_CATEGORIES}/{$category.category_id}-{$category.category_name|@makeFilename}"><img class="serendipity_entryIcon" title="{$category.category_name|@escape}{$category.category_description|@emptyPrefix}" alt="{$category.category_name|@escape}" src="{$category.category_icon}" /></a> + {/if} + {/foreach} </span> {/if} <div class="serendipity_entry_body"> - {$bydate[date][x].body} + {$entry.body} </div> - {if $bydate[date][x].is_extended} - <div class="serendipity_entry_extended"><a id="extended"></a>{$bydate[date][x].extended}</div> + {if $entry.is_extended} + <div class="serendipity_entry_extended"><a id="extended"></a>{$entry.extended}</div> {/if} - {if $bydate[date][x].has_extended and not $is_single_entry} - <br /><a href="{$bydate[date][x].entryLink}#extended">{$bydate[date][x].title|@printf:VIEW_EXTENDED_ENTRY}</a><br /><br /> + {if $entry.has_extended and not $is_single_entry} + <br /><a href="{$entry.link}#extended">{$entry.title|@printf:VIEW_EXTENDED_ENTRY}</a><br /><br /> {/if} <div class='serendipity_entryFooter'> - {$CONST.POSTED_BY} {$bydate[date][x].username} - {if is_array($bydate[date][x].categories)} - {$CONST.IN} {section name=cat loop=$bydate[date][x].categories}<a href="{$serendipityHTTPPath}{$serendipityRewritePrefix}{$CONST.PATH_CATEGORIES}/{$bydate[date][x].categories[cat].categoryid}-{$bydate[date][x].categories[cat].category_name|@makeFilename}">{$bydate[date][x].categories[cat].category_name|@escape}</a> {/section} + {$CONST.POSTED_BY} {$entry.username} + {if $entry.categories} + {$CONST.IN} {foreach from=$entry.categories item="category"}<a href="{$serendipityHTTPPath}{$serendipityRewritePrefix}{$CONST.PATH_CATEGORIES}/{$category.categoryid}-{$category.category_name|@makeFilename}">{$category.category_name|@escape}</a> {/foreach} {/if} - {$CONST.AT} <a href="{$bydate[date][x].entryLink}">{$bydate[date][x].timestamp|@formatTime:'%H:%M'}</a> + {$CONST.AT} <a href="{$entry.link}">{$entry.timestamp|@formatTime:'%H:%M'}</a> - {if $bydate[date][x].has_comments} + {if $entry.has_comments} {if $use_popups} - | <a href="{$serendipityHTTPPath}comment.php?serendipity[entry_id]={$bydate[date][x].id}&serendipity[type]=comments" onclick="window.open(this.href, \'comments\', \'width=480,height=480,scrollbars=yes\'); return false;">{$bydate[date][x].label_comments} ({$bydate[date][x].comments})</a> + | <a href="{$serendipityHTTPPath}comment.php?serendipity[entry_id]={$entry.id}&serendipity[type]=comments" onclick="window.open(this.href, \'comments\', \'width=480,height=480,scrollbars=yes\'); return false;">{$entry.label_comments} ({$entry.comments})</a> {else} - | <a href="{$bydate[date][x].entryLink}#comments">{$bydate[date][x].label_trackbacks} ({$bydate[date][x].comments})</a> + | <a href="{$entry.link}#comments">{$entry.label_comments} ({$entry.comments})</a> {/if} {/if} - {if $bydate[date][x].has_trackbacks} + {if $entry.has_trackbacks} {if $use_popups} - | <a href="{$serendipityHTTPPath}comment.php?serendipity[entry_id]={$bydate[date][x].id}&serendipity[type]=trackbacks" onclick="window.open(this.href, \'comments\', \'width=480,height=480,scrollbars=yes\'); return false;">{$bydate[date][x].label_trackbacks} ({$bydate[date][x].trackbacks})</a> + | <a href="{$serendipityHTTPPath}comment.php?serendipity[entry_id]={$entry.id}&serendipity[type]=trackbacks" onclick="window.open(this.href, \'comments\', \'width=480,height=480,scrollbars=yes\'); return false;">{$entry.label_trackbacks} ({$entry.trackbacks})</a> {else} - | <a href="{$bydate[date][x].entryLink}#trackbacks">{$bydate[date][x].label_trackbacks} ({$bydate[date][x].trackbacks})</a> + | <a href="{$entry.entryLink}#trackbacks">{$entry.label_trackbacks} ({$entry.trackbacks})</a> {/if} {/if} - {if $bydate[date][x].is_entry_owner} - | <a href="{$serendipityBaseURL}serendipity_entries.php?serendipity[action]=admin&serendipity[adminModule]=entries&serendipity[adminAction]=edit&serendipity[id]={$bydate[date][x].id}">{$CONST.EDIT_ENTRY}</a> + {if $entry.is_entry_owner} + | <a href="{$serendipityBaseURL}serendipity_entries.php?serendipity[action]=admin&serendipity[adminModule]=entries&serendipity[adminAction]=edit&serendipity[id]={$entry.id}">{$CONST.EDIT_ENTRY}</a> {/if} - {$bydate[date][x].add_footer} + {$entry.add_footer} </div> </div> <!-- @@ -66,13 +68,13 @@ xmlns:trackback="http://madskills.com/public/xml/rss/module/trackback/" xmlns:dc="http://purl.org/dc/elements/1.1/"> <rdf:Description - rdf:about="{$serendipityBaseURL}{$serendipityRewritePrefix}feeds/ei_{$bydate[date][x].id}.rdf" - trackback:ping="{$serendipityBaseURL}comment.php?type=trackback&entry_id={$bydate[date][x].id}" - dc:title="{$bydate[date][x].title}" - dc:identifier="{$bydate[date][x].rdf_ident}" /> + rdf:about="{$serendipityBaseURL}{$serendipityRewritePrefix}feeds/ei_{$entry.id}.rdf" + trackback:ping="{$serendipityBaseURL}comment.php?type=trackback&entry_id={$entry.id}" + dc:title="{$entry.title}" + dc:identifier="{$entry.rdf_ident}" /> </rdf:RDF> --> - {$bydate[date][x].plugin_display_dat} + {$entry.plugin_display_dat} {if $CONST.DATA_UNSUBSCRIBED} <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_UNSUBSCRIBED|@printf:UNSUBSCRIBE_OK}</div><br /> @@ -114,9 +116,9 @@ <div class="serendipity_commentsTitle">{$CONST.COMMENTS}</div> <div class="serendipity_center">{$CONST.DISPLAY_COMMENTS_AS} {if $is_cview_linear} - ({$CONST.COMMENTS_VIEWMODE_LINEAR} | <a href="{$serendipityHTTPPath}{$serendipityIndexFile}?url={$bydate[date][x].commURL}&serendipity[cview]={$CONST.VIEWMODE_THREADED}#comments">{$CONST.COMMENTS_VIEWMODE_THREADED}</a>) + ({$CONST.COMMENTS_VIEWMODE_LINEAR} | <a href="{$serendipityHTTPPath}{$serendipityIndexFile}?url={$entry.commURL}&serendipity[cview]={$CONST.VIEWMODE_THREADED}#comments">{$CONST.COMMENTS_VIEWMODE_THREADED}</a>) {else} - (<a href="{$serendipityHTTPPath}{$serendipityIndexFile}?url={$bydate[date][x].commURL}&serendipity[cview]={$CONST.VIEWMODE_LINEAR}#comments">{$CONST.COMMENTS_VIEWMODE_LINEAR}</a> | {$CONST.COMMENTS_VIEWMODE_THREADED}) + (<a href="{$serendipityHTTPPath}{$serendipityIndexFile}?url={$entry.commURL}&serendipity[cview]={$CONST.VIEWMODE_LINEAR}#comments">{$CONST.COMMENTS_VIEWMODE_LINEAR}</a> | {$CONST.COMMENTS_VIEWMODE_THREADED}) {/if} </div> {$COMMENTS} @@ -145,11 +147,12 @@ </div> {/if} - {$bydate[date][x].plugin_backend_preview} - {/section} + {$entry.plugin_backend_preview} + {/foreach} </div> - - {/section} + {foreachelse} + {$CONST.NO_ENTRIES_TO_PRINT} + {/foreach} <div class='serendipity_entryFooter' style="text-align: center"> {if $footer_prev_page} |
|
From: Tom S. <tom...@us...> - 2004-09-26 00:48:01
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12960 Modified Files: Tag: branch-smarty serendipity_functions.inc.php Log Message: - Replace some of this $bydate etc. logic, since it's really unnecessary and bad for performance TODO: Fix entries_summary.tpl - Don't attempt to show category images, if there are none Index: serendipity_functions.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v retrieving revision 1.419.2.32 retrieving revision 1.419.2.33 diff -u -d -r1.419.2.32 -r1.419.2.33 --- serendipity_functions.inc.php 25 Sep 2004 23:29:19 -0000 1.419.2.32 +++ serendipity_functions.inc.php 26 Sep 2004 00:47:47 -0000 1.419.2.33 @@ -928,57 +928,43 @@ return; // no display of this item } + // We shouldn't return here, because we want Smarty to handle the output if (!is_array($entries) || $entries[0] == false || !isset($entries[0]['timestamp'])) { - $serendipity['smarty']->assign('content_message', '<br />' . NO_ENTRIES_TO_PRINT); - return; + $entries = array(); } - /* pre-walk the array to collect them keyed by index. Retouch the array for Smarty section - logic. It needs to walk on numerical arrays, so we can now longer use an associative - index holding a date string. So we now see which entries are made on the same date ($ts) - and then create a referring array $dateref which tells s9y that 20040918 is index 0, 20040917 is - index 1 and so on, so that the key can later be reconstracted in the smarty loop. */ - $bydate = array(); - $dateref = array(); - $dateseen = array(); - $datekey = -1; + $dategroup = array(); for ($x = 0, $num_entries = count($entries); $x < $num_entries; $x++) { + $ts = $key = date('Ymd', $entries[$x]['timestamp']); if (!empty($entries[$x]['properties']['ep_is_sticky']) && serendipity_db_bool($entries[$x]['properties']['ep_is_sticky'])) { - $timestamp = $ts = 'sticky'; - } else { - $timestamp = $entries[$x]['timestamp']; - $ts = date('Ymd', $timestamp); + $entries[$x]['is_sticky'] = true; + $key = 'sticky'; } if (!empty($entries[$x]['properties']['ep_cache_body'])) { - $entries[$x]['body'] =& $entries[$x]['properties']['ep_cache_body']; + $entries[$x]['body'] = &$entries[$x]['properties']['ep_cache_body']; $entries[$x]['is_cached'] = true; } if (!empty($entries[$x]['properties']['ep_cache_extended'])) { - $entries[$x]['extended'] =& $entries[$x]['properties']['ep_cache_extended']; + $entries[$x]['extended'] = &$entries[$x]['properties']['ep_cache_extended']; $entries[$x]['is_cached'] = true; } - if (!isset($dateseen[$ts])) { - // No entries existing for the same timestamp. Increment to the next numerical index - $datekey++; - } - - $bydate[$datekey][] =& $entries[$x]; - $dateseen[$ts] = true; - $dateref[$datekey] = $timestamp; + $dategroup[$key]['date'] = $entries[$x]['timestamp']; + $dategroup[$key]['is_sticky'] = isset($entries[$x]['is_sticky']); + $dategroup[$key]['entries'][] = &$entries[$x]; } - foreach($bydate AS $date => $ents) { - foreach($ents AS $x => $_entry) { - $entry = &$bydate[$date][$x]; + foreach($dategroup as $properties) { + foreach($properties['entries'] as $x => $_entry) { + $entry = &$properties['entries'][$x]; // PHP4 Compat serendipity_plugin_api::hook_event('frontend_display', $entry); - $entry['entryLink'] = serendipity_archiveURL($entry['id'], $entry['title'], 'serendipityHTTPPath'); - $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'] = serendipity_archiveURL($entry['id'], $entry['title'], 'serendipityHTTPPath'); + $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); if (strlen($entry['extended'])) { $entry['has_extended'] = true; @@ -1066,9 +1052,9 @@ serendipity_db_bool($entry['moderate_comments']), $entry ); - } /* END FULL ENTRY LOGIC */ - } // end for-loop (entries) - } // end for-loop (dates) + } // END FULL ENTRY LOGIC + } // end foreach-loop (entries) + } // end foreach-loop (dates) if (!isset($serendipity['GET']['id']) && (!isset($serendipity['hidefooter']) || $serendipity['hidefooter'] == false) && @@ -1078,12 +1064,7 @@ serendipity_printEntryFooter(true); } - $serendipity['smarty']->assign( - array( - 'bydate' => $bydate, - 'dateref' => $dateref - ) - ); + $serendipity['smarty']->assign('entries', $dategroup); if (isset($serendipity['short_archives']) && $serendipity['short_archives']) { serendipity_smarty_fetch('ENTRIES', 'entries_summary.tpl', true); |
|
From: Tom S. <tom...@us...> - 2004-09-25 23:29:32
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27865 Modified Files: Tag: branch-smarty serendipity_config.inc.php serendipity_functions.inc.php serendipity_sidebar_items.php Log Message: - Convert the calendar into a Smarty tempate, and move it out of _functions.inc.php Index: serendipity_config.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v retrieving revision 1.93.2.9 retrieving revision 1.93.2.10 diff -u -d -r1.93.2.9 -r1.93.2.10 --- serendipity_config.inc.php 21 Sep 2004 20:43:15 -0000 1.93.2.9 +++ serendipity_config.inc.php 25 Sep 2004 23:29:19 -0000 1.93.2.10 @@ -246,6 +246,7 @@ $serendipity['smarty']->register_modifier('formatTime', 'serendipity_smarty_formatTime'); $serendipity['smarty']->register_function('serendipity_printSidebar', 'serendipity_smarty_printSidebar'); $serendipity['smarty']->register_function('serendipity_hookPlugin', 'serendipity_smarty_hookPlugin'); +$serendipity['smarty']->register_function('serendipity_getFile', 'serendipity_smarty_getFile'); /* vim: set sts=4 ts=4 expandtab : */ ?> Index: serendipity_sidebar_items.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v retrieving revision 1.84.2.1 retrieving revision 1.84.2.2 diff -u -d -r1.84.2.1 -r1.84.2.2 --- serendipity_sidebar_items.php 15 Sep 2004 15:17:09 -0000 1.84.2.1 +++ serendipity_sidebar_items.php 25 Sep 2004 23:29:20 -0000 1.84.2.2 @@ -36,6 +36,7 @@ $title = CALENDAR; + /* TODO: Patch this out */ if (!isset($serendipity['GET']['calendarZoom'])) { if (!isset($serendipity['GET']['range'])) { $calendarZoom = date('Y') . date('m'); @@ -46,22 +47,170 @@ $calendarZoom = $serendipity['GET']['calendarZoom']; } - serendipity_drawCalendar( - substr( - $calendarZoom, - 4, - 2 - ), - substr( - $calendarZoom, - 0, - 4 - ), - $this->get_config('beginningOfWeek') - ); - } -} + /* TODO: must change */ + $year = substr($calendarZoom, 0, 4); + $month = substr($calendarZoom, 4, 2); + + $bow = (int)$this->get_config('beginningOfWeek', 1); + // Check for faulty input, is so - run the default + if ($bow>6) { + $bow = 1; + } + + // Catch faulty month + $month = (int)$month; + if ($month<1) { + $month = 1; + } + + // How many days does the month have? + $ts = strtotime($year . '-' . sprintf('%02d', $month) . '-01'); + $nrOfDays = date('t', $ts); + $firstDayWeekDay = date('w', $ts); + + // Calculate the first day of the week, based on the beginning of the week ($bow) + if ( $bow > $firstDayWeekDay ) { + $firstDayWeekDay = $firstDayWeekDay+7-$bow; + } elseif ( $bow < $firstDayWeekDay ) { + $firstDayWeekDay = $firstDayWeekDay-$bow; + } else { + $firstDayWeekDay = 0; + } + + // Calculate the number of next/previous month + if ($month > 1) { + $previousMonth = $month-1; + $previousYear = $year; + } else { + $previousMonth = 12; + $previousYear = $year-1; + } + + if ($month <12) { + $nextMonth = $month+1; + $nextYear = $year; + } else { + $nextMonth = 1; + $nextYear = $year+1; + } + + $endts = mktime(0, 0, 0, $month + 1, 1, $year); + + // Get first and last entry + $minmax = serendipity_db_query("SELECT MAX(timestamp) AS max, MIN(timestamp) AS min FROM {$serendipity['dbPrefix']}entries"); + if (!is_array($minmax) || !is_array($minmax[0]) || $minmax[0]['min'] < 1 || $minmax[0]['max'] < 1) { + // If no entry is available yet, allow scrolling a year back and forth + $minmax = array( + '0' => array( + 'min' => mktime(0, 0, 0, 1, 1, date('Y')-1), + 'max' => mktime(0, 0, 0, 1, 1, date('Y')+1) + ) + ); + } + + // Find out about diary entries + $add_query = ''; + $base_query = ''; + if (isset($serendipity['GET']['category'])) { + $categoryid = serendipity_db_escape_string($serendipity['GET']['category']); + + if (is_numeric($categoryid)) { + $base_query = 'serendipity[category]=' . $categoryid; + $add_query = '&' . $base_query; + $querystring = "SELECT timestamp + FROM {$serendipity['dbPrefix']}entries e, + {$serendipity['dbPrefix']}category c, + {$serendipity['dbPrefix']}entrycat ec + WHERE e.timestamp >= $ts + AND e.timestamp <= $endts + AND e.isdraft = 'false' + AND e.id = ec.entryid + AND c.categoryid = ec.categoryid + AND c.category_left BETWEEN " . implode(' AND ', serendipity_fetchCategoryRange($categoryid)); + } + } + + if (!isset($querystring)) { + $querystring = "SELECT timestamp + FROM {$serendipity['dbPrefix']}entries e + WHERE e.timestamp >= $ts and e.timestamp <= $endts AND e.isdraft = 'false'"; + } + + $rows = serendipity_db_query($querystring); + $activeDays = array(); + if (is_array($rows)) { + foreach ($rows as $row) { + $activeDays[date('j', $row['timestamp'])] = $row['timestamp']; + } + } + + // Print the calendar + $currDay = 1; + $nrOfRows = ceil(($nrOfDays+$firstDayWeekDay)/7); + $today_day = date('j'); + $today_month = date('m'); + $today_year = date('Y'); + for ($x = 0; $x < 6; $x++) { + // Break out if we are out of days + if ($currDay > $nrOfDays) { + break; + } + // Prepare row + for ($y = 0; $y < 7; $y++) { + $cellProps = array(); + $printDay = ''; + $link = ''; + + if ($x == 0) { + $cellProps['FirstRow'] = 1; + } + if ($y == 0) { + $cellProps['FirstInRow'] = 1; + } + if ($y == 6) { + $cellProps['LastInRow'] = 1; + } + if ($x == $nrOfRows-1) { + $cellProps['LastRow'] = 1; + } + + // If it's not a blank day, we print the day + if (($x > 0 || $y >= $firstDayWeekDay) && $currDay <= $nrOfDays) { + $printDay = $currDay; + if ($today_year == $year && $today_month == $month && $today_day == $currDay) { + $cellProps['Today'] = 1; + } + if (isset($activeDays[$currDay]) && $activeDays[$currDay] > 1) { + $cellProps['Active'] = 1; + $cellProps['Link'] = serendipity_archiveDateUrl(sprintf('%4d%02d%02d', $year, $month, $currDay)) . $base_query; + } + $currDay++; + } + $smartyRows[$x]['days'][] = array('name' => $printDay, + 'properties' => $cellProps, + 'classes' => implode(' ', array_keys($cellProps))); + } // end for + } // end for + $serendipity['smarty']->assign('plugin_calendar_weeks', $smartyRows); + + + $dow = array(); + for ($i = 1; $i <= 7; $i++) { + $dow[] = array('date' => mktime(0,0,0,3,$bow+$i-1,2004)); + } + $serendipity['smarty']->assign('plugin_calendar_dow', $dow); + + + $serendipity['smarty']->assign('plugin_calendar_head', array('month_date' => $ts, + 'uri_previous' => $serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] .'?serendipity[calendarZoom]='. $previousYear . sprintf('%02d',$previousMonth) . $add_query, + 'uri_month' => serendipity_archiveDateUrl($year . sprintf('%02d', $month)) . $base_query, + 'uri_next' => $serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] .'?serendipity[calendarZoom]='. $previousYear . sprintf('%02d',$nextMonth) . $add_query, + 'minScroll' => $minmax[0]['min'], + 'maxScroll' => $minmax[0]['max'])); + echo serendipity_smarty_fetch('CALENDAR', 'plugin_calendar.tpl'); + } // end function +} // end class class serendipity_quicksearch_plugin extends serendipity_plugin { function introspect(&$propbag) Index: serendipity_functions.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v retrieving revision 1.419.2.31 retrieving revision 1.419.2.32 diff -u -d -r1.419.2.31 -r1.419.2.32 --- serendipity_functions.inc.php 24 Sep 2004 18:13:12 -0000 1.419.2.31 +++ serendipity_functions.inc.php 25 Sep 2004 23:29:19 -0000 1.419.2.32 @@ -285,217 +285,6 @@ } } -// Draws a little calendar in HTML -function serendipity_drawCalendar($month, $year, $bow=1) { - global $serendipity; - - // Check for faulty input, is so - run the default - if (!is_numeric($bow) || (int)$bow>6) { - $bow = 1; - } - - $bow = (int)$bow; - - // Catch faulty month - if ($month<1) { - $month = 1; - } - $month = sprintf('%d', $month); - - // How many days does the month have? - $ts = strtotime($year . '-' . sprintf('%02d', $month) . '-01'); - $nrOfDays = date('t', $ts); - $firstDayWeekDay = date('w', $ts); - - // Calculate the first day of the week, based on the beginning of the week ($bow) - if ( $bow > $firstDayWeekDay ) { - $firstDayWeekDay = $firstDayWeekDay+7-$bow; - } elseif ( $bow < $firstDayWeekDay ) { - $firstDayWeekDay = $firstDayWeekDay-$bow; - } else { - $firstDayWeekDay = 0; - } - - // Calculate the number of next/previous month - if ($month > 1) { - $previousMonth = $month-1; - $previousYear = $year; - } else { - $previousMonth = 12; - $previousYear = $year-1; - } - - if ($month <12) { - $nextMonth = $month+1; - $nextYear = $year; - } else { - $nextMonth = 1; - $nextYear = $year+1; - } - - $endts = mktime(0, 0, 0, $month + 1, 1, $year); - - // Get first and last entry - $minmax = serendipity_db_query("SELECT MAX(timestamp) AS max, MIN(timestamp) AS min FROM {$serendipity['dbPrefix']}entries"); - if (!is_array($minmax) || !is_array($minmax[0]) || $minmax[0]['min'] < 1 || $minmax[0]['max'] < 1) { - // If no entry is available yet, allow scrolling a year back and forth - $minmax = array( - '0' => array( - 'min' => mktime(0, 0, 0, 1, 1, date('Y')-1), - 'max' => mktime(0, 0, 0, 1, 1, date('Y')+1) - ) - ); - } - - // Find out about diary entries - $add_query = ''; - $base_query = ''; - if (isset($serendipity['GET']['category'])) { - $categoryid = serendipity_db_escape_string($serendipity['GET']['category']); - - if (is_numeric($categoryid)) { - $base_query = 'serendipity[category]=' . $categoryid; - $add_query = '&' . $base_query; - $querystring = "SELECT timestamp - FROM {$serendipity['dbPrefix']}entries e, - {$serendipity['dbPrefix']}category c, - {$serendipity['dbPrefix']}entrycat ec - WHERE e.timestamp >= $ts - AND e.timestamp <= $endts - AND e.isdraft = 'false' - AND e.id = ec.entryid - AND c.categoryid = ec.categoryid - AND c.category_left BETWEEN " . implode(' AND ', serendipity_fetchCategoryRange($categoryid)); - } - } - - if (!isset($querystring)) { - $querystring = "SELECT timestamp - FROM {$serendipity['dbPrefix']}entries e - WHERE e.timestamp >= $ts and e.timestamp <= $endts AND e.isdraft = 'false'"; - } - - $rows = serendipity_db_query($querystring); - $activeDays = array(); - if (is_array($rows)) { - foreach ($rows as $row) { - $activeDays[date('j', $row['timestamp'])] = $row['timestamp']; - } - } - - // Prepare the table - $link = serendipity_archiveDateUrl($year . sprintf('%02d', $month)) . $base_query; -?> -<table width="100%" class="serendipity_calendar" cellspacing="0" cellpadding="0"> - <tr> - <td align="left" class="serendipity_calendarHeader"> -<?php - // Only allow to scroll to the previous month if the first entry is from the month before - if ($ts > ($minmax[0]['min'] - 2678400)) { -?> - <a title="<?php echo BACK; ?>" href="<?php echo $serendipity['serendipityHTTPPath'] . $serendipity['indexFile']; ?>?serendipity[calendarZoom]=<?php echo $previousYear . sprintf('%02d',$previousMonth) . $add_query; ?>"><img alt="<?php echo BACK; ?>" src="<?php echo serendipity_getTemplateFile('img/back.png'); ?>" <?php echo ($serendipity['XHTML11'] ? 'style="border: 0px"' : 'border="0"'); ?> /></a> -<?php - } -?> - </td> - - <td colspan="5" align="center" valign="bottom" class="serendipity_calendarHeader"> - <b><?php echo ($serendipity['XHTML11'] ? '<span style="white-space: nowrap">' : '<nobr>'); ?><a href="<?php echo $link; ?>"><?php echo serendipity_formatTime("%B '%y", mktime(0,0,0,$month, 1, $year)) ?></a><?php echo ($serendipity['XHTML11'] ? '</span>' : '</nobr>'); ?></b> - </td> - - <td align="right" class="serendipity_calendarHeader"> -<?php - // Only allow to scroll to the next month if the last entry is from the month before - if ($endts < ($minmax[0]['max'] + 2678400)) { -?> - <a title="<?php echo FORWARD; ?>" href="<?php echo $serendipity['serendipityHTTPPath'] . $serendipity['indexFile']; ?>?serendipity[calendarZoom]=<?php echo $nextYear . sprintf('%02d', $nextMonth) . $add_query; ?>"><img alt="<?php echo FORWARD; ?>" src="<?php echo serendipity_getTemplateFile('img/forward.png'); ?>" <?php echo ($serendipity['XHTML11'] ? 'style="border: 0px"' : 'border="0"'); ?> /></a> -<?php - } -?> - </td> - </tr> - - <tr> -<?php - for ($i = 1; $i <= 7; $i++) { - $date = mktime(0,0,0,3,$bow+$i-1,2004); -?> - <td scope="col" abbr="<?php echo serendipity_formatTime("%A", $date) ?>" title="<?php echo serendipity_formatTime("%A", $date) ?>" class="serendipity_weekDayName" align="center"><?php echo substr(serendipity_formatTime("%a", $date),0,2); ?></td> -<?php - } -?> - </tr> - -<?php - // Print the calendar - $currDay = 1; - $nrOfRows = ceil(($nrOfDays+$firstDayWeekDay)/7); - $today_day = date('j'); - $today_month = date('m'); - $today_year = date('Y'); - for ($x = 0; $x < 6; $x++) { - // Break out if we are out of days - if ($currDay > $nrOfDays) { - break; - } -?> - <tr class="serendipity_calendar"> -<?php - // Prepare row - for ($y = 0; $y < 7; $y++) { - $cellProps = array(); - $link = ''; - - if ($x == 0) { - $cellProps[] = 'FirstRow'; - } - if ($y == 0) { - $cellProps[] = 'FirstInRow'; - } - if ($y == 6) { - $cellProps[] = 'LastInRow'; - } - if ($x == $nrOfRows-1) { - $cellProps[] = 'LastRow'; - } - - // If it's not a blank day, we print the day - if (($x > 0 || $y >= $firstDayWeekDay) && $currDay <= $nrOfDays) { - - $printDay = $currDay; - - if ($today_year == $year && $today_month == $month && $today_day == $currDay) { - $cellProps[] = 'Today'; - } - - if (isset($activeDays[$currDay]) && $activeDays[$currDay] > 1) { - $cellProps[] = 'Active'; - } - - if (isset($activeDays[$currDay]) && $activeDays[$currDay] > 1) { - $printDay = '<a href="' . serendipity_archiveDateUrl(sprintf('%4d%02d%02d', $year, $month, $currDay)) . $base_query . '">'. $printDay .'</a>'; - } - - $currDay++; -?> - <td class="serendipity_calendarDay <?php echo implode(' ', $cellProps); ?>"><?php echo $printDay ?></td> -<?php - // If it's a blank day (a day outside the month) - } else { -?> - <td class="serendipity_calendarDay BlankDay <?php echo implode(' ', $cellProps); ?>"> </td> -<?php - } // end if (print day) - } // end for-loop (inner: days) -?> - </tr> -<?php - } // end for-loop (outer: weeks) -?> -</table> -<?php -} // end function: serendipity_drawCalendar - function serendipity_fetchCategoryRange($categoryid) { global $serendipity; @@ -3544,6 +3333,15 @@ return serendipity_plugin_api::generate_plugins($params['side']); } +function serendipity_smarty_getFile($params, &$smarty) { + if ( !isset($params['file']) ) { + $smarty->trigger_error(__FUNCTION__ .": missing 'file' parameter"); + return; + } + return serendipity_getTemplateFile($params['file']); +} + + function serendipity_smarty_formatTime($timestamp, $format) { if (defined($format)) { return serendipity_formatTime(constant($format), $timestamp); |
|
From: Tom S. <tom...@us...> - 2004-09-25 23:29:32
|
Update of /cvsroot/php-blog/serendipity/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27865/templates/default Added Files: Tag: branch-smarty plugin_calendar.tpl Log Message: - Convert the calendar into a Smarty tempate, and move it out of _functions.inc.php --- NEW FILE: plugin_calendar.tpl --- <table width="100%" cellspacing="0" cellpadding="0" class="serendipity_calendar"> <tr> <td class="serendipity_calendarHeader" align="left"> {if $plugin_calendar_head.minScroll le $plugin_calendar_head.month_date} <a title="Back" href="{$plugin_calendar_head.uri_previous}"><img alt="{$const.BACK}" src="{serendipity_getFile file="img/back.png"}" border="0"></a> {/if} </td> <td colspan="5" class="serendipity_calendarHeader" align="center" valign="bottom"> <b><nobr><a href="{$plugin_calendar_head.uri_month}">{$plugin_calendar_head.month_date|formatTime:"%B '%y"}</a></nobr></b> </td> <td class="serendipity_calendarHeader" align="right"> {if $plugin_calendar_head.maxScroll ge $plugin_calendar_head.month_date} <a title="Forward" href="{$plugin_calendar_head.uri_next}"><img alt="{$const.FORWARD}" src="{serendipity_getFile file="img/forward.png"}" border="0"></a> {/if} </td> </tr> <tr> {foreach from=$plugin_calendar_dow item="dow"} <td scope="col" abbr="{$dow.date|@formatTime:"%A"}" title="{$dow.date|@formatTime:"%A"}" class="serendipity_weekDayName" align="center">{$dow.date|@formatTime:"%a"|@truncate:2:""}</td> {/foreach} </tr> {foreach from=$plugin_calendar_weeks item="week"} <tr class="serendipity_calendar"> {foreach from=$week.days item="day"} <td class="serendipity_calendarDay {$day.classes}">{if $day.properties.Active}<a href="{$day.properties.Link}">{/if}{$day.name|@default:" "}{if $day.properties.Active}</a>{/if}</td> {/foreach} </tr> {/foreach} </table> |
|
From: Sebastian N. <no...@us...> - 2004-09-25 11:08:15
|
Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_karma In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22443/plugins/serendipity_event_karma Modified Files: Tag: branch-smarty serendipity_event_karma.php Log Message: MFH Index: serendipity_event_karma.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_karma/serendipity_event_karma.php,v retrieving revision 1.14.2.1 retrieving revision 1.14.2.2 diff -u -d -r1.14.2.1 -r1.14.2.2 --- serendipity_event_karma.php 14 Sep 2004 13:11:17 -0000 1.14.2.1 +++ serendipity_event_karma.php 25 Sep 2004 11:08:05 -0000 1.14.2.2 @@ -6,7 +6,7 @@ case 'de': @define('PLUGIN_KARMA_VERSION', '1.2'); @define('PLUGIN_KARMA_NAME', 'Karma'); - @define('PLUGIN_KARMA_BLAHBLAH', 'Abstimmung über die Eintrags'); + @define('PLUGIN_KARMA_BLAHBLAH', 'Abstimmung über die Einträge'); @define('PLUGIN_KARMA_VOTETEXT', 'Karma dieses Eintrags: '); @define('PLUGIN_KARMA_RATE', 'Eintrag bewerten: %s'); @define('PLUGIN_KARMA_VOTEPOINT_1', 'Sehr gut!'); |
|
From: Sebastian N. <no...@us...> - 2004-09-25 11:01:02
|
Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_karma In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20780/plugins/serendipity_event_karma Modified Files: serendipity_event_karma.php Log Message: sounds better in german Index: serendipity_event_karma.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_karma/serendipity_event_karma.php,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- serendipity_event_karma.php 14 Sep 2004 12:56:10 -0000 1.15 +++ serendipity_event_karma.php 25 Sep 2004 11:00:51 -0000 1.16 @@ -6,7 +6,7 @@ case 'de': @define('PLUGIN_KARMA_VERSION', '1.2'); @define('PLUGIN_KARMA_NAME', 'Karma'); - @define('PLUGIN_KARMA_BLAHBLAH', 'Abstimmung über die Eintrags'); + @define('PLUGIN_KARMA_BLAHBLAH', 'Abstimmung über die Einträge'); @define('PLUGIN_KARMA_VOTETEXT', 'Karma dieses Eintrags: '); @define('PLUGIN_KARMA_RATE', 'Eintrag bewerten: %s'); @define('PLUGIN_KARMA_VOTEPOINT_1', 'Sehr gut!'); |
|
From: Tom S. <tom...@us...> - 2004-09-24 22:03:30
|
Update of /cvsroot/php-blog/serendipity/lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9154/lang Modified Files: Tag: branch-smarty serendipity_lang_bg.inc.php serendipity_lang_cs.inc.php serendipity_lang_cz.inc.php serendipity_lang_da.inc.php serendipity_lang_en.inc.php serendipity_lang_es.inc.php serendipity_lang_fr.inc.php serendipity_lang_nl.inc.php serendipity_lang_pt.inc.php Log Message: MFH Index: serendipity_lang_cs.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v retrieving revision 1.61 retrieving revision 1.61.2.1 diff -u -d -r1.61 -r1.61.2.1 --- serendipity_lang_cs.inc.php 5 Sep 2004 19:56:57 -0000 1.61 +++ serendipity_lang_cs.inc.php 24 Sep 2004 22:03:18 -0000 1.61.2.1 @@ -549,6 +549,10 @@ @define('COMMENTS_VIEWMODE_LINEAR', 'Linear'); // Translate @define('DISPLAY_COMMENTS_AS', 'Display comments as'); // Translate @define('ADD_MEDIA_BLAHBLAH', '<b>Add a file to your media repository:</b><p>Here you can upload mediafiles, or tell me to fetch them from somewhere in the web! If you don\'t have an appropriate image, <a href="http://images.google.com" target="_blank">search for images on google</a> matching your thoughts, the results are often useful and funny :)<p><b>Select method:</b><br>'); // Translate +@define('COMMENTS_FILTER_SHOW', 'Show'); // Translate +@define('COMMENTS_FILTER_ALL', 'All'); // Translate +@define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate +@define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file Index: serendipity_lang_nl.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_nl.inc.php,v retrieving revision 1.36 retrieving revision 1.36.2.1 diff -u -d -r1.36 -r1.36.2.1 --- serendipity_lang_nl.inc.php 8 Sep 2004 08:51:54 -0000 1.36 +++ serendipity_lang_nl.inc.php 24 Sep 2004 22:03:19 -0000 1.36.2.1 @@ -554,6 +554,10 @@ @define('NUMBER_FORMAT_THOUSANDS', ','); // Translate @define('CATEGORY_DELETED_ARTICLES_MOVED', 'Category #%s deleted. Old articles moved to category #%s'); // Translate @define('ADD_MEDIA_BLAHBLAH', '<b>Add a file to your media repository:</b><p>Here you can upload mediafiles, or tell me to fetch them from somewhere in the web! If you don\'t have an appropriate image, <a href="http://images.google.com" target="_blank">search for images on google</a> matching your thoughts, the results are often useful and funny :)<p><b>Select method:</b><br>'); // Translate +@define('COMMENTS_FILTER_SHOW', 'Show'); // Translate +@define('COMMENTS_FILTER_ALL', 'All'); // Translate +@define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate +@define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file Index: serendipity_lang_en.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v retrieving revision 1.79.2.2 retrieving revision 1.79.2.3 diff -u -d -r1.79.2.2 -r1.79.2.3 --- serendipity_lang_en.inc.php 16 Sep 2004 16:39:38 -0000 1.79.2.2 +++ serendipity_lang_en.inc.php 24 Sep 2004 22:03:19 -0000 1.79.2.3 @@ -546,6 +546,9 @@ @define('COMMENTS_VIEWMODE_THREADED', 'Threaded'); @define('COMMENTS_VIEWMODE_LINEAR', 'Linear'); @define('DISPLAY_COMMENTS_AS', 'Display comments as'); - +@define('COMMENTS_FILTER_SHOW', 'Show'); +@define('COMMENTS_FILTER_ALL', 'All'); +@define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); +@define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); /* vim: set sts=4 ts=4 expandtab : */ ?> Index: serendipity_lang_bg.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_bg.inc.php,v retrieving revision 1.15 retrieving revision 1.15.2.1 diff -u -d -r1.15 -r1.15.2.1 --- serendipity_lang_bg.inc.php 8 Sep 2004 08:51:54 -0000 1.15 +++ serendipity_lang_bg.inc.php 24 Sep 2004 22:03:18 -0000 1.15.2.1 @@ -531,6 +531,10 @@ @define('SORT_BY', 'Sort by'); // Translate @define('ADD_MEDIA_BLAHBLAH', '<b>Add a file to your media repository:</b><p>Here you can upload mediafiles, or tell me to fetch them from somewhere in the web! If you don\'t have an appropriate image, <a href="http://images.google.com" target="_blank">search for images on google</a> matching your thoughts, the results are often useful and funny :)<p><b>Select method:</b><br>'); // Translate @define('XML_IMAGE_TO_DISPLAY_DESC', 'Links to XML Feeds will be displayed by this image. Leave empty for default, enter \'none\' to disable.'); // Translate +@define('COMMENTS_FILTER_SHOW', 'Show'); // Translate +@define('COMMENTS_FILTER_ALL', 'All'); // Translate +@define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate +@define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file Index: serendipity_lang_pt.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_pt.inc.php,v retrieving revision 1.36.2.1 retrieving revision 1.36.2.2 diff -u -d -r1.36.2.1 -r1.36.2.2 --- serendipity_lang_pt.inc.php 20 Sep 2004 14:23:20 -0000 1.36.2.1 +++ serendipity_lang_pt.inc.php 24 Sep 2004 22:03:19 -0000 1.36.2.2 @@ -550,6 +550,10 @@ @define('INSTALL_TOP_AS_LINKS', 'Exibir maiores saídas/referências como links?'); @define('INSTALL_TOP_AS_LINKS_DESC', '"não": Saídas e Referências são exibidas como puro texto para prevenir spam do google. "sim": Saídas e Refrências são exibidas como links. "padrão": Usa o valor definido na configuração global (recomendado).'); @define('ADD_MEDIA_BLAHBLAH', '<b>Adiciona um arquivo para o seu repositório de mídia:</b><p>Aqui você pode transferir arquivos de mídia, ou oriente-me para pegá-lo em algum lugar na web! Se não possuir uma imagem apropriada, <a href="http://images.google.com" target="_blank">procure no google</a> alguma imagem que tenha relação com o assunto, os resultados são geralmente úteis e divertidos :)<p><b>Selecione o método:</b><br>'); +@define('COMMENTS_FILTER_SHOW', 'Show'); // Translate +@define('COMMENTS_FILTER_ALL', 'All'); // Translate +@define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate +@define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file Index: serendipity_lang_da.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v retrieving revision 1.79.2.1 retrieving revision 1.79.2.2 diff -u -d -r1.79.2.1 -r1.79.2.2 --- serendipity_lang_da.inc.php 14 Sep 2004 14:58:10 -0000 1.79.2.1 +++ serendipity_lang_da.inc.php 24 Sep 2004 22:03:18 -0000 1.79.2.2 @@ -544,6 +544,10 @@ @define('SIDEBAR_PLUGINS', 'Sidebarplugins'); @define('EVENT_PLUGINS', 'Hændelseplugins'); @define('ADD_MEDIA_BLAHBLAH', '<b>Tilføj en fil til dit mediearkiv:</b><p>Her kan du uploade mediafiler, eller bede mig hente dem fra et sted på nette! Hvis du ikke har et passende billeder, <a href="http://images.google.com" target="_blank">prøv at søg efter billeder på google</a> der passer til dine tanker, resultatet er ofte brugbart og sjovt :)<p><b>Vælg metode:</b><br>'); +@define('COMMENTS_FILTER_SHOW', 'Show'); // Translate +@define('COMMENTS_FILTER_ALL', 'All'); // Translate +@define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate +@define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate /* vim: set sts=4 ts=4 expandtab : */ -?> +?> \ No newline at end of file Index: serendipity_lang_fr.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fr.inc.php,v retrieving revision 1.58.2.1 retrieving revision 1.58.2.2 diff -u -d -r1.58.2.1 -r1.58.2.2 --- serendipity_lang_fr.inc.php 24 Sep 2004 09:30:58 -0000 1.58.2.1 +++ serendipity_lang_fr.inc.php 24 Sep 2004 22:03:19 -0000 1.58.2.2 @@ -552,6 +552,10 @@ @define('DISPLAY_COMMENTS_AS', 'Afficher les commentaires en'); @define('PAGE_BROWSE_ENTRIES', 'Page %s de %s sur %s billets au total'); @define('ADD_MEDIA_BLAHBLAH', '<b>Ajouter un fichier à votre médiathèque:</b><p>Vous permet d\'uploader des fichiers, ou de me dire une adresse internet de laquelle je peux les télécharger. Si vous n\'avez pas d\'image appropriée, vous pouvez faire une <a href="http://images.google.com" target="_blank">recherche d\'images avec Google</a>, les résultats sont souvent intéressants et toujours très comiques :)<p><b>Choisissez une méthode:</b><br>'); +@define('COMMENTS_FILTER_SHOW', 'Show'); // Translate +@define('COMMENTS_FILTER_ALL', 'All'); // Translate +@define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate +@define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file Index: serendipity_lang_cz.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cz.inc.php,v retrieving revision 1.61 retrieving revision 1.61.2.1 diff -u -d -r1.61 -r1.61.2.1 --- serendipity_lang_cz.inc.php 5 Sep 2004 19:56:57 -0000 1.61 +++ serendipity_lang_cz.inc.php 24 Sep 2004 22:03:18 -0000 1.61.2.1 @@ -547,6 +547,10 @@ @define('COMMENTS_VIEWMODE_LINEAR', 'Linear'); // Translate @define('DISPLAY_COMMENTS_AS', 'Display comments as'); // Translate @define('ADD_MEDIA_BLAHBLAH', '<b>Add a file to your media repository:</b><p>Here you can upload mediafiles, or tell me to fetch them from somewhere in the web! If you don\'t have an appropriate image, <a href="http://images.google.com" target="_blank">search for images on google</a> matching your thoughts, the results are often useful and funny :)<p><b>Select method:</b><br>'); // Translate +@define('COMMENTS_FILTER_SHOW', 'Show'); // Translate +@define('COMMENTS_FILTER_ALL', 'All'); // Translate +@define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate +@define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file Index: serendipity_lang_es.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v retrieving revision 1.77 retrieving revision 1.77.2.1 diff -u -d -r1.77 -r1.77.2.1 --- serendipity_lang_es.inc.php 5 Sep 2004 19:56:57 -0000 1.77 +++ serendipity_lang_es.inc.php 24 Sep 2004 22:03:19 -0000 1.77.2.1 @@ -553,6 +553,10 @@ @define('ADVANCED_OPTIONS', 'Advanced Options'); // Translate @define('EDIT_ENTRY', 'Edit entry'); // Translate @define('ADD_MEDIA_BLAHBLAH', '<b>Add a file to your media repository:</b><p>Here you can upload mediafiles, or tell me to fetch them from somewhere in the web! If you don\'t have an appropriate image, <a href="http://images.google.com" target="_blank">search for images on google</a> matching your thoughts, the results are often useful and funny :)<p><b>Select method:</b><br>'); // Translate +@define('COMMENTS_FILTER_SHOW', 'Show'); // Translate +@define('COMMENTS_FILTER_ALL', 'All'); // Translate +@define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate +@define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file |
|
From: Tom S. <tom...@us...> - 2004-09-24 22:03:28
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9154 Modified Files: Tag: branch-smarty NEWS serendipity_admin_comments.inc.php Log Message: MFH Index: serendipity_admin_comments.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_comments.inc.php,v retrieving revision 1.17.2.3 retrieving revision 1.17.2.4 diff -u -d -r1.17.2.3 -r1.17.2.4 --- serendipity_admin_comments.inc.php 16 Sep 2004 12:18:09 -0000 1.17.2.3 +++ serendipity_admin_comments.inc.php 24 Sep 2004 22:03:18 -0000 1.17.2.4 @@ -113,6 +113,13 @@ $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'"; +} else { + $serendipity['GET']['filter']['show'] = 'all'; +} /* Paging */ $sql = serendipity_db_query("SELECT COUNT(*) AS total FROM {$serendipity['dbPrefix']}comments c WHERE c.type = 'NORMAL' ". $and, true); @@ -143,11 +150,6 @@ ". $and ." " . (($serendipity['serendipityUserlevel'] != USERLEVEL_ADMIN) ? 'AND e.authorid = ' . $serendipity['authorId'] : '') . " ORDER BY id DESC $limit"); -if (!is_array($sql)) { - echo NO_COMMENTS; - return; -} - ?> <script type="text/javascript"> function toggle(id) { @@ -201,10 +203,23 @@ <td><input type="text" name="serendipity[filter][ip]" size="15" value="<?php echo $serendipity['GET']['filter']['ip'] ?>" /></td> <td><?php echo CONTENT ?>:</td> <td><input type="text" name="serendipity[filter][body]" size="15" value="<?php echo $serendipity['GET']['filter']['body'] ?>" /></td> - <td colspan="2" align="center"><input type="submit" name="submit" value=" - <?php echo GO ?> - " /></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> + </select></td> + </tr> + <tr> + <td colspan="6" align="right"><input type="submit" name="submit" value=" - <?php echo GO ?> - " /></td> </tr> </table> </form> +<?php + if (!is_array($sql)) { + echo '<div align="center">'. NO_COMMENTS .'</div>'; + } else { +?> <form action="" method="POST" name="formMultiDelete" id="formMultiDelete"> <input type="hidden" name="serendipity[formAction]" value="multiDelete" /> <table width="100%" cellspacing="5" cellpadding="0" border="0" class="serendipity_admin_list"> @@ -220,6 +235,7 @@ </td> </tr> <?php + $i = 0; foreach ($sql as $rs) { $i++; @@ -299,3 +315,4 @@ </tr> </table> </form> +<?php } ?> Index: NEWS =================================================================== RCS file: /cvsroot/php-blog/serendipity/NEWS,v retrieving revision 1.214.2.22 retrieving revision 1.214.2.23 diff -u -d -r1.214.2.22 -r1.214.2.23 --- NEWS 23 Sep 2004 12:31:42 -0000 1.214.2.22 +++ NEWS 24 Sep 2004 22:03:18 -0000 1.214.2.23 @@ -29,6 +29,10 @@ Version 0.7 () ------------------------------------------------------------------------ + * Extend filter in commment moderation to allow the user to select + which types of comments he wants displayed "All", "Only approved", + "Need approval" (tomsommer) + * Upgraded Spam Protector event plugin. Optionally: - use Captchas - images with string sequences which a user has to enter before his comment is accepted. @@ -54,7 +58,7 @@ * Bug #1031444 - Fixed postgreSQL error (for older versions of pgsql) when creating categories (garvinhicking) - * Fixed wrong XHTML enties in remoterss and shoutbox plugin. Thanks + * Fixed wrong XHTML entities in remoterss and shoutbox plugin. Thanks to Stephan van Beerschoten! (garvinhicking) * Fixed bug #1030581: Category sidebar plugin now properly displays |
|
From: Tom S. <tom...@us...> - 2004-09-24 22:01:36
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8862 Modified Files: serendipity_admin_comments.inc.php Log Message: - Remove leftovers :) Index: serendipity_admin_comments.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_comments.inc.php,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- serendipity_admin_comments.inc.php 24 Sep 2004 21:58:17 -0000 1.21 +++ serendipity_admin_comments.inc.php 24 Sep 2004 22:01:26 -0000 1.22 @@ -218,7 +218,6 @@ <?php if (!is_array($sql)) { echo '<div align="center">'. NO_COMMENTS .'</div>'; - $sql = array(); } else { ?> <form action="" method="POST" name="formMultiDelete" id="formMultiDelete"> @@ -237,11 +236,6 @@ </tr> <?php -if (!is_array($sql)) { - echo NO_COMMENTS; - $sql = array(); -} - $i = 0; foreach ($sql as $rs) { $i++; |
Update of /cvsroot/php-blog/serendipity/lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7837/lang Modified Files: serendipity_lang_bg.inc.php serendipity_lang_cs.inc.php serendipity_lang_cz.inc.php serendipity_lang_da.inc.php serendipity_lang_de.inc.php serendipity_lang_en.inc.php serendipity_lang_es.inc.php serendipity_lang_fr.inc.php serendipity_lang_it.inc.php serendipity_lang_nl.inc.php serendipity_lang_no.inc.php serendipity_lang_pt.inc.php Log Message: - Add ability to filter comments depending on their approval status (idea by isotopp) - Fix some very broken logic when there were no comments returned by the SQL query Index: serendipity_lang_cs.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -r1.61 -r1.62 --- serendipity_lang_cs.inc.php 5 Sep 2004 19:56:57 -0000 1.61 +++ serendipity_lang_cs.inc.php 24 Sep 2004 21:58:18 -0000 1.62 @@ -549,6 +549,10 @@ @define('COMMENTS_VIEWMODE_LINEAR', 'Linear'); // Translate @define('DISPLAY_COMMENTS_AS', 'Display comments as'); // Translate @define('ADD_MEDIA_BLAHBLAH', '<b>Add a file to your media repository:</b><p>Here you can upload mediafiles, or tell me to fetch them from somewhere in the web! If you don\'t have an appropriate image, <a href="http://images.google.com" target="_blank">search for images on google</a> matching your thoughts, the results are often useful and funny :)<p><b>Select method:</b><br>'); // Translate +@define('COMMENTS_FILTER_SHOW', 'Show'); // Translate +@define('COMMENTS_FILTER_ALL', 'All'); // Translate +@define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate +@define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file Index: serendipity_lang_no.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_no.inc.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- serendipity_lang_no.inc.php 14 Sep 2004 10:29:20 -0000 1.2 +++ serendipity_lang_no.inc.php 24 Sep 2004 21:58:18 -0000 1.3 @@ -544,6 +544,10 @@ @define('SIDEBAR_PLUGINS', 'Sidebar-plugins'); @define('EVENT_PLUGINS', 'Hendelses-lugins'); @define('ADD_MEDIA_BLAHBLAH', '<b>Legg til en fil til ditt mediabibliotek:</b><p>Her kan du laste opp mediafiler, eller be meg om å hente dem fra en adresse på nettet! Hvis du ikke har et passende bilde, <a href="http://images.google.com" target="_blank">søk etter bilder på Google</a> som passer til tankene dine. Resultatene er ofte nyttige og morsomme :)<p><b>Velg metode:</b><br>'); +@define('COMMENTS_FILTER_SHOW', 'Show'); // Translate +@define('COMMENTS_FILTER_ALL', 'All'); // Translate +@define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate +@define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate -?> +?> \ No newline at end of file Index: serendipity_lang_nl.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_nl.inc.php,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- serendipity_lang_nl.inc.php 8 Sep 2004 08:51:54 -0000 1.36 +++ serendipity_lang_nl.inc.php 24 Sep 2004 21:58:18 -0000 1.37 @@ -554,6 +554,10 @@ @define('NUMBER_FORMAT_THOUSANDS', ','); // Translate @define('CATEGORY_DELETED_ARTICLES_MOVED', 'Category #%s deleted. Old articles moved to category #%s'); // Translate @define('ADD_MEDIA_BLAHBLAH', '<b>Add a file to your media repository:</b><p>Here you can upload mediafiles, or tell me to fetch them from somewhere in the web! If you don\'t have an appropriate image, <a href="http://images.google.com" target="_blank">search for images on google</a> matching your thoughts, the results are often useful and funny :)<p><b>Select method:</b><br>'); // Translate +@define('COMMENTS_FILTER_SHOW', 'Show'); // Translate +@define('COMMENTS_FILTER_ALL', 'All'); // Translate +@define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate +@define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file Index: serendipity_lang_en.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v retrieving revision 1.81 retrieving revision 1.82 diff -u -d -r1.81 -r1.82 --- serendipity_lang_en.inc.php 16 Sep 2004 16:36:12 -0000 1.81 +++ serendipity_lang_en.inc.php 24 Sep 2004 21:58:18 -0000 1.82 @@ -546,6 +546,9 @@ @define('COMMENTS_VIEWMODE_THREADED', 'Threaded'); @define('COMMENTS_VIEWMODE_LINEAR', 'Linear'); @define('DISPLAY_COMMENTS_AS', 'Display comments as'); - +@define('COMMENTS_FILTER_SHOW', 'Show'); +@define('COMMENTS_FILTER_ALL', 'All'); +@define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); +@define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); /* vim: set sts=4 ts=4 expandtab : */ ?> Index: serendipity_lang_bg.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_bg.inc.php,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- serendipity_lang_bg.inc.php 8 Sep 2004 08:51:54 -0000 1.15 +++ serendipity_lang_bg.inc.php 24 Sep 2004 21:58:18 -0000 1.16 @@ -531,6 +531,10 @@ @define('SORT_BY', 'Sort by'); // Translate @define('ADD_MEDIA_BLAHBLAH', '<b>Add a file to your media repository:</b><p>Here you can upload mediafiles, or tell me to fetch them from somewhere in the web! If you don\'t have an appropriate image, <a href="http://images.google.com" target="_blank">search for images on google</a> matching your thoughts, the results are often useful and funny :)<p><b>Select method:</b><br>'); // Translate @define('XML_IMAGE_TO_DISPLAY_DESC', 'Links to XML Feeds will be displayed by this image. Leave empty for default, enter \'none\' to disable.'); // Translate +@define('COMMENTS_FILTER_SHOW', 'Show'); // Translate +@define('COMMENTS_FILTER_ALL', 'All'); // Translate +@define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate +@define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file Index: serendipity_lang_pt.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_pt.inc.php,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- serendipity_lang_pt.inc.php 20 Sep 2004 14:23:21 -0000 1.37 +++ serendipity_lang_pt.inc.php 24 Sep 2004 21:58:18 -0000 1.38 @@ -550,6 +550,10 @@ @define('INSTALL_TOP_AS_LINKS', 'Exibir maiores saídas/referências como links?'); @define('INSTALL_TOP_AS_LINKS_DESC', '"não": Saídas e Referências são exibidas como puro texto para prevenir spam do google. "sim": Saídas e Refrências são exibidas como links. "padrão": Usa o valor definido na configuração global (recomendado).'); @define('ADD_MEDIA_BLAHBLAH', '<b>Adiciona um arquivo para o seu repositório de mídia:</b><p>Aqui você pode transferir arquivos de mídia, ou oriente-me para pegá-lo em algum lugar na web! Se não possuir uma imagem apropriada, <a href="http://images.google.com" target="_blank">procure no google</a> alguma imagem que tenha relação com o assunto, os resultados são geralmente úteis e divertidos :)<p><b>Selecione o método:</b><br>'); +@define('COMMENTS_FILTER_SHOW', 'Show'); // Translate +@define('COMMENTS_FILTER_ALL', 'All'); // Translate +@define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate +@define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file Index: serendipity_lang_it.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_it.inc.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- serendipity_lang_it.inc.php 15 Sep 2004 11:21:13 -0000 1.2 +++ serendipity_lang_it.inc.php 24 Sep 2004 21:58:18 -0000 1.3 @@ -546,7 +546,11 @@ @define('COMMENTS_VIEWMODE_THREADED', 'Per argomento'); @define('COMMENTS_VIEWMODE_LINEAR', 'Cronologicamente'); @define('DISPLAY_COMMENTS_AS', 'Mostra commenti'); +@define('COMMENTS_FILTER_SHOW', 'Show'); // Translate +@define('COMMENTS_FILTER_ALL', 'All'); // Translate +@define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate +@define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate /* vim: set sts=4 ts=4 expandtab : */ -?> +?> \ No newline at end of file Index: serendipity_lang_da.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v retrieving revision 1.80 retrieving revision 1.81 diff -u -d -r1.80 -r1.81 --- serendipity_lang_da.inc.php 14 Sep 2004 14:57:33 -0000 1.80 +++ serendipity_lang_da.inc.php 24 Sep 2004 21:58:18 -0000 1.81 @@ -544,6 +544,10 @@ @define('SIDEBAR_PLUGINS', 'Sidebarplugins'); @define('EVENT_PLUGINS', 'Hændelseplugins'); @define('ADD_MEDIA_BLAHBLAH', '<b>Tilføj en fil til dit mediearkiv:</b><p>Her kan du uploade mediafiler, eller bede mig hente dem fra et sted på nette! Hvis du ikke har et passende billeder, <a href="http://images.google.com" target="_blank">prøv at søg efter billeder på google</a> der passer til dine tanker, resultatet er ofte brugbart og sjovt :)<p><b>Vælg metode:</b><br>'); +@define('COMMENTS_FILTER_SHOW', 'Show'); // Translate +@define('COMMENTS_FILTER_ALL', 'All'); // Translate +@define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate +@define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate /* vim: set sts=4 ts=4 expandtab : */ -?> +?> \ No newline at end of file Index: serendipity_lang_fr.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fr.inc.php,v retrieving revision 1.59 retrieving revision 1.60 diff -u -d -r1.59 -r1.60 --- serendipity_lang_fr.inc.php 24 Sep 2004 09:30:46 -0000 1.59 +++ serendipity_lang_fr.inc.php 24 Sep 2004 21:58:18 -0000 1.60 @@ -552,6 +552,10 @@ @define('DISPLAY_COMMENTS_AS', 'Afficher les commentaires en'); @define('PAGE_BROWSE_ENTRIES', 'Page %s de %s sur %s billets au total'); @define('ADD_MEDIA_BLAHBLAH', '<b>Ajouter un fichier à votre médiathèque:</b><p>Vous permet d\'uploader des fichiers, ou de me dire une adresse internet de laquelle je peux les télécharger. Si vous n\'avez pas d\'image appropriée, vous pouvez faire une <a href="http://images.google.com" target="_blank">recherche d\'images avec Google</a>, les résultats sont souvent intéressants et toujours très comiques :)<p><b>Choisissez une méthode:</b><br>'); +@define('COMMENTS_FILTER_SHOW', 'Show'); // Translate +@define('COMMENTS_FILTER_ALL', 'All'); // Translate +@define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate +@define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file Index: serendipity_lang_cz.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cz.inc.php,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -r1.61 -r1.62 --- serendipity_lang_cz.inc.php 5 Sep 2004 19:56:57 -0000 1.61 +++ serendipity_lang_cz.inc.php 24 Sep 2004 21:58:18 -0000 1.62 @@ -547,6 +547,10 @@ @define('COMMENTS_VIEWMODE_LINEAR', 'Linear'); // Translate @define('DISPLAY_COMMENTS_AS', 'Display comments as'); // Translate @define('ADD_MEDIA_BLAHBLAH', '<b>Add a file to your media repository:</b><p>Here you can upload mediafiles, or tell me to fetch them from somewhere in the web! If you don\'t have an appropriate image, <a href="http://images.google.com" target="_blank">search for images on google</a> matching your thoughts, the results are often useful and funny :)<p><b>Select method:</b><br>'); // Translate +@define('COMMENTS_FILTER_SHOW', 'Show'); // Translate +@define('COMMENTS_FILTER_ALL', 'All'); // Translate +@define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate +@define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file Index: serendipity_lang_es.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v retrieving revision 1.77 retrieving revision 1.78 diff -u -d -r1.77 -r1.78 --- serendipity_lang_es.inc.php 5 Sep 2004 19:56:57 -0000 1.77 +++ serendipity_lang_es.inc.php 24 Sep 2004 21:58:18 -0000 1.78 @@ -553,6 +553,10 @@ @define('ADVANCED_OPTIONS', 'Advanced Options'); // Translate @define('EDIT_ENTRY', 'Edit entry'); // Translate @define('ADD_MEDIA_BLAHBLAH', '<b>Add a file to your media repository:</b><p>Here you can upload mediafiles, or tell me to fetch them from somewhere in the web! If you don\'t have an appropriate image, <a href="http://images.google.com" target="_blank">search for images on google</a> matching your thoughts, the results are often useful and funny :)<p><b>Select method:</b><br>'); // Translate +@define('COMMENTS_FILTER_SHOW', 'Show'); // Translate +@define('COMMENTS_FILTER_ALL', 'All'); // Translate +@define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate +@define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file Index: serendipity_lang_de.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v retrieving revision 1.99 retrieving revision 1.100 diff -u -d -r1.99 -r1.100 --- serendipity_lang_de.inc.php 11 Sep 2004 20:21:41 -0000 1.99 +++ serendipity_lang_de.inc.php 24 Sep 2004 21:58:18 -0000 1.100 @@ -546,6 +546,10 @@ @define('COMMENTS_VIEWMODE_LINEAR', 'Linear'); @define('DISPLAY_COMMENTS_AS', 'Ansicht der Kommentare: '); @define('ADD_MEDIA_BLAHBLAH', '<b>Bild/Datei zur Sammlung hinzufügen:</b><p>Hier können Sie eine Datei (z.B. ein Bild) hochladen, oder mitteilen, von wo es geladen werden soll! Wenn das passende Bild fehlt, einfach bei Google danach suchen. Probieren Sie mal <a href="http://images.google.de" target="_blank">Googles Bildsuche</a>, die Resultate sind oft brauchbar, aber auf jeden Fall witzig :)<p><b>Methode wählen:</b><br>'); +@define('COMMENTS_FILTER_SHOW', 'Show'); // Translate +@define('COMMENTS_FILTER_ALL', 'All'); // Translate +@define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate +@define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate /* vim: set sts=4 ts=4 expandtab : */ -?> +?> \ No newline at end of file |
|
From: Tom S. <tom...@us...> - 2004-09-24 21:58:28
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7837 Modified Files: NEWS serendipity_admin_comments.inc.php Log Message: - Add ability to filter comments depending on their approval status (idea by isotopp) - Fix some very broken logic when there were no comments returned by the SQL query Index: serendipity_admin_comments.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_comments.inc.php,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- serendipity_admin_comments.inc.php 16 Sep 2004 10:29:08 -0000 1.20 +++ serendipity_admin_comments.inc.php 24 Sep 2004 21:58:17 -0000 1.21 @@ -113,6 +113,13 @@ $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'"; +} else { + $serendipity['GET']['filter']['show'] = 'all'; +} /* Paging */ $sql = serendipity_db_query("SELECT COUNT(*) AS total FROM {$serendipity['dbPrefix']}comments c WHERE c.type = 'NORMAL' ". $and, true); @@ -143,11 +150,6 @@ ". $and ." " . (($serendipity['serendipityUserlevel'] != USERLEVEL_ADMIN) ? 'AND e.authorid = ' . $serendipity['authorId'] : '') . " ORDER BY id DESC $limit"); -if (!is_array($sql)) { - echo NO_COMMENTS; - return; -} - ?> <script type="text/javascript"> function toggle(id) { @@ -201,10 +203,24 @@ <td><input type="text" name="serendipity[filter][ip]" size="15" value="<?php echo $serendipity['GET']['filter']['ip'] ?>" /></td> <td><?php echo CONTENT ?>:</td> <td><input type="text" name="serendipity[filter][body]" size="15" value="<?php echo $serendipity['GET']['filter']['body'] ?>" /></td> - <td colspan="2" align="center"><input type="submit" name="submit" value=" - <?php echo GO ?> - " /></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> + </select></td> + </tr> + <tr> + <td colspan="6" align="right"><input type="submit" name="submit" value=" - <?php echo GO ?> - " /></td> </tr> </table> </form> +<?php + if (!is_array($sql)) { + echo '<div align="center">'. NO_COMMENTS .'</div>'; + $sql = array(); + } else { +?> <form action="" method="POST" name="formMultiDelete" id="formMultiDelete"> <input type="hidden" name="serendipity[formAction]" value="multiDelete" /> <table width="100%" cellspacing="5" cellpadding="0" border="0" class="serendipity_admin_list"> @@ -220,6 +236,12 @@ </td> </tr> <?php + +if (!is_array($sql)) { + echo NO_COMMENTS; + $sql = array(); +} + $i = 0; foreach ($sql as $rs) { $i++; @@ -299,3 +321,4 @@ </tr> </table> </form> +<?php } ?> Index: NEWS =================================================================== RCS file: /cvsroot/php-blog/serendipity/NEWS,v retrieving revision 1.232 retrieving revision 1.233 diff -u -d -r1.232 -r1.233 --- NEWS 23 Sep 2004 12:31:57 -0000 1.232 +++ NEWS 24 Sep 2004 21:58:17 -0000 1.233 @@ -3,6 +3,10 @@ Version 0.7 () ------------------------------------------------------------------------ + * Extend filter in commment moderation to allow the user to select + which types of comments he wants displayed "All", "Only approved", + "Need approval" (tomsommer) + * Upgraded Spam Protector event plugin. Optionally: - use Captchas - images with string sequences which a user has to enter before his comment is accepted. @@ -28,7 +32,7 @@ * Bug #1031444 - Fixed postgreSQL error (for older versions of pgsql) when creating categories (garvinhicking) - * Fixed wrong XHTML enties in remoterss and shoutbox plugin. Thanks + * Fixed wrong XHTML entities in remoterss and shoutbox plugin. Thanks to Stephan van Beerschoten! (garvinhicking) * Fixed bug #1030581: Category sidebar plugin now properly displays |
|
From: Tom S. <tom...@us...> - 2004-09-24 18:13:23
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1835 Modified Files: Tag: branch-smarty serendipity_functions.inc.php Log Message: - Nuke excess serendipity_archiveURL Index: serendipity_functions.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v retrieving revision 1.419.2.30 retrieving revision 1.419.2.31 diff -u -d -r1.419.2.30 -r1.419.2.31 --- serendipity_functions.inc.php 23 Sep 2004 12:31:50 -0000 1.419.2.30 +++ serendipity_functions.inc.php 24 Sep 2004 18:13:12 -0000 1.419.2.31 @@ -1226,8 +1226,6 @@ /* IF WE ARE DISPLAYING A FULL ENTRY */ if (isset($serendipity['GET']['id'])) { - $comm_url = serendipity_archiveURL($entry['id'], $entry['title'], 'baseURL', false); - serendipity_printTrackbacks(serendipity_fetchTrackbacks($entry['id'])); ob_start(); // TODO: Remove recursion and output buffering @@ -1272,7 +1270,7 @@ serendipity_displayCommentForm( $entry['id'], - $serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] . '?url=' . $comm_url, + $serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] . '?url=' . $entry['commURL'], true, $serendipity['POST'], true, |
|
From: Tom S. <tom...@us...> - 2004-09-24 17:46:45
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29145 Modified Files: Tag: branch-smarty compat.php Log Message: - Make $translation static Index: compat.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/compat.php,v retrieving revision 1.18.2.2 retrieving revision 1.18.2.3 diff -u -d -r1.18.2.2 -r1.18.2.3 --- compat.php 22 Sep 2004 11:34:03 -0000 1.18.2.2 +++ compat.php 24 Sep 2004 17:46:36 -0000 1.18.2.3 @@ -104,8 +104,8 @@ function serendipity_get_bool($item) { - $translation = array('true' => true, - 'false' => false); + static $translation = array('true' => true, + 'false' => false); if (isset($translation[$item])) { return $translation[$item]; |
|
From: Garvin H. <gar...@us...> - 2004-09-24 13:03:04
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31656 Modified Files: comment.php Log Message: make captchas work in popup comment window Index: comment.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/comment.php,v retrieving revision 1.47 retrieving revision 1.48 diff -u -d -r1.47 -r1.48 --- comment.php 14 Sep 2004 12:56:08 -0000 1.47 +++ comment.php 24 Sep 2004 13:02:55 -0000 1.48 @@ -125,7 +125,7 @@ ?> <div class="serendipity_commentsTitle"><?php echo COMMENTS; ?></div> <?php - $query = "SELECT allow_comments, moderate_comments FROM {$serendipity['dbPrefix']}entries WHERE id = '" . $id . "'"; + $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)); @@ -150,7 +150,7 @@ ?> <div class="serendipity_commentsTitle"><?php echo ADD_COMMENT; ?></div> <?php - serendipity_displayCommentForm($id, '?', $comments, $serendipity['POST'], true, serendipity_db_bool($ca['moderate_comments'])); + serendipity_displayCommentForm($id, '?', $comments, $serendipity['POST'], true, serendipity_db_bool($ca['moderate_comments']), $ca); } elseif (!serendipity_db_bool($ca['allow_comments'])) { ?> <div class="serendipity_center serendipity_msg_important"><?php echo COMMENTS_CLOSED; ?></div> <?php |
|
From: Garvin H. <gar...@us...> - 2004-09-24 13:00:25
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30955 Modified Files: Tag: branch-smarty comment.php Log Message: captchas didn't work on popup windows Index: comment.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/comment.php,v retrieving revision 1.44.2.2 retrieving revision 1.44.2.3 diff -u -d -r1.44.2.2 -r1.44.2.3 --- comment.php 14 Sep 2004 13:11:15 -0000 1.44.2.2 +++ comment.php 24 Sep 2004 13:00:14 -0000 1.44.2.3 @@ -125,7 +125,7 @@ ?> <div class="serendipity_commentsTitle"><?php echo COMMENTS; ?></div> <?php - $query = "SELECT allow_comments, moderate_comments FROM {$serendipity['dbPrefix']}entries WHERE id = '" . $id . "'"; + $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)); @@ -150,7 +150,7 @@ ?> <div class="serendipity_commentsTitle"><?php echo ADD_COMMENT; ?></div> <?php - serendipity_displayCommentForm($id, '?', $comments, $serendipity['POST'], true, serendipity_db_bool($ca['moderate_comments'])); + serendipity_displayCommentForm($id, '?', $comments, $serendipity['POST'], true, serendipity_db_bool($ca['moderate_comments']), $ca); } elseif (!serendipity_db_bool($ca['allow_comments'])) { ?> <div class="serendipity_center serendipity_msg_important"><?php echo COMMENTS_CLOSED; ?></div> <?php |
|
From: Garvin H. <gar...@us...> - 2004-09-24 10:37:22
|
Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30848 Modified Files: Tag: branch-smarty serendipity_event_spamblock.php Log Message: respect shared installations 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.13 retrieving revision 1.4.2.14 diff -u -d -r1.4.2.13 -r1.4.2.14 --- serendipity_event_spamblock.php 24 Sep 2004 10:34:26 -0000 1.4.2.13 +++ serendipity_event_spamblock.php 24 Sep 2004 10:36:53 -0000 1.4.2.14 @@ -413,7 +413,14 @@ } else { header('Content-Type: image/png'); $output_char = strtolower($_SESSION['spamblock']['captcha']{$parts[1] - 1}); - echo file_get_contents($serendipity['serendipityPath'] . 'plugins/serendipity_event_spamblock/captcha_' . $output_char . '.png'); + $cap = $serendipity['serendipityPath'] . 'plugins/serendipity_event_spamblock/captcha_' . $output_char . '.png'; + if (!file_exists($cap)) { + $cap = S9Y_INCLUDE_PATH . 'plugins/serendipity_event_spamblock/captcha_' . $output_char . '.png'; + } + + if (file_exists($cap)) { + echo file_get_contents($cap); + } } return true; break; |
|
From: Garvin H. <gar...@us...> - 2004-09-24 10:36:58
|
Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30850 Modified Files: serendipity_event_spamblock.php Log Message: respect shared installations Index: serendipity_event_spamblock.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- serendipity_event_spamblock.php 24 Sep 2004 10:34:22 -0000 1.17 +++ serendipity_event_spamblock.php 24 Sep 2004 10:36:49 -0000 1.18 @@ -413,7 +413,14 @@ } else { header('Content-Type: image/png'); $output_char = strtolower($_SESSION['spamblock']['captcha']{$parts[1] - 1}); - echo file_get_contents($serendipity['serendipityPath'] . 'plugins/serendipity_event_spamblock/captcha_' . $output_char . '.png'); + $cap = $serendipity['serendipityPath'] . 'plugins/serendipity_event_spamblock/captcha_' . $output_char . '.png'; + if (!file_exists($cap)) { + $cap = S9Y_INCLUDE_PATH . 'plugins/serendipity_event_spamblock/captcha_' . $output_char . '.png'; + } + + if (file_exists($cap)) { + echo file_get_contents($cap); + } } return true; break; |
