You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
(179) |
Apr
(56) |
May
(53) |
Jun
(65) |
Jul
(70) |
Aug
(89) |
Sep
(50) |
Oct
(38) |
Nov
(12) |
Dec
(12) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(57) |
Feb
(226) |
Mar
(172) |
Apr
(194) |
May
(120) |
Jun
(162) |
Jul
(297) |
Aug
(156) |
Sep
(312) |
Oct
(180) |
Nov
(358) |
Dec
(362) |
| 2005 |
Jan
(275) |
Feb
(224) |
Mar
(202) |
Apr
(157) |
May
(133) |
Jun
(115) |
Jul
(211) |
Aug
(257) |
Sep
(135) |
Oct
(116) |
Nov
(106) |
Dec
(81) |
| 2006 |
Jan
(74) |
Feb
(94) |
Mar
(59) |
Apr
(125) |
May
(50) |
Jun
(71) |
Jul
(45) |
Aug
(80) |
Sep
(3) |
Oct
(44) |
Nov
(50) |
Dec
(38) |
| 2007 |
Jan
(46) |
Feb
(33) |
Mar
(24) |
Apr
(28) |
May
(19) |
Jun
(37) |
Jul
(66) |
Aug
(73) |
Sep
(87) |
Oct
(33) |
Nov
(39) |
Dec
(37) |
| 2008 |
Jan
(20) |
Feb
(54) |
Mar
(47) |
Apr
(68) |
May
(10) |
Jun
(13) |
Jul
(13) |
Aug
(25) |
Sep
(11) |
Oct
(22) |
Nov
(22) |
Dec
(34) |
| 2009 |
Jan
(34) |
Feb
(35) |
Mar
(11) |
Apr
(10) |
May
(15) |
Jun
(18) |
Jul
(28) |
Aug
(22) |
Sep
(9) |
Oct
(12) |
Nov
(6) |
Dec
(32) |
| 2010 |
Jan
(11) |
Feb
(7) |
Mar
(9) |
Apr
(3) |
May
(16) |
Jun
(1) |
Jul
(2) |
Aug
(25) |
Sep
(9) |
Oct
(8) |
Nov
(4) |
Dec
(8) |
| 2011 |
Jan
(17) |
Feb
(1) |
Mar
(6) |
Apr
(7) |
May
(5) |
Jun
(2) |
Jul
(12) |
Aug
(3) |
Sep
(18) |
Oct
(3) |
Nov
(2) |
Dec
|
| 2012 |
Jan
(92) |
Feb
(74) |
Mar
(64) |
Apr
(55) |
May
(44) |
Jun
(91) |
Jul
(35) |
Aug
(42) |
Sep
(32) |
Oct
(56) |
Nov
(42) |
Dec
(81) |
| 2013 |
Jan
(117) |
Feb
(130) |
Mar
(33) |
Apr
(36) |
May
(155) |
Jun
(241) |
Jul
(113) |
Aug
(70) |
Sep
(50) |
Oct
(55) |
Nov
(34) |
Dec
(36) |
| 2014 |
Jan
(94) |
Feb
(67) |
Mar
(177) |
Apr
(67) |
May
(147) |
Jun
(137) |
Jul
(58) |
Aug
(56) |
Sep
(62) |
Oct
(35) |
Nov
(118) |
Dec
(53) |
| 2015 |
Jan
(204) |
Feb
(165) |
Mar
(275) |
Apr
(42) |
May
(58) |
Jun
(91) |
Jul
(81) |
Aug
(62) |
Sep
(23) |
Oct
(63) |
Nov
(29) |
Dec
(110) |
| 2016 |
Jan
(82) |
Feb
(55) |
Mar
(48) |
Apr
(92) |
May
(77) |
Jun
(41) |
Jul
(27) |
Aug
(41) |
Sep
(101) |
Oct
(84) |
Nov
(12) |
Dec
(18) |
| 2017 |
Jan
(44) |
Feb
(40) |
Mar
(23) |
Apr
(79) |
May
(27) |
Jun
(12) |
Jul
(20) |
Aug
(14) |
Sep
(3) |
Oct
(9) |
Nov
(4) |
Dec
(9) |
| 2018 |
Jan
(5) |
Feb
(23) |
Mar
(150) |
Apr
(114) |
May
(63) |
Jun
(25) |
Jul
(23) |
Aug
(54) |
Sep
(43) |
Oct
(10) |
Nov
(9) |
Dec
(1) |
| 2019 |
Jan
(1) |
Feb
(27) |
Mar
(27) |
Apr
(64) |
May
(21) |
Jun
(17) |
Jul
(12) |
Aug
(81) |
Sep
(15) |
Oct
(25) |
Nov
(15) |
Dec
(13) |
| 2020 |
Jan
(5) |
Feb
(4) |
Mar
(95) |
Apr
(59) |
May
(53) |
Jun
(22) |
Jul
(3) |
Aug
(13) |
Sep
(10) |
Oct
(4) |
Nov
(3) |
Dec
(1) |
| 2021 |
Jan
(20) |
Feb
(32) |
Mar
(34) |
Apr
(22) |
May
(58) |
Jun
(43) |
Jul
(35) |
Aug
(2) |
Sep
(14) |
Oct
(1) |
Nov
(2) |
Dec
|
| 2022 |
Jan
(2) |
Feb
(6) |
Mar
(4) |
Apr
|
May
(5) |
Jun
(4) |
Jul
(3) |
Aug
(5) |
Sep
(6) |
Oct
(3) |
Nov
(38) |
Dec
(15) |
| 2023 |
Jan
(26) |
Feb
(12) |
Mar
(3) |
Apr
(9) |
May
(2) |
Jun
(5) |
Jul
(8) |
Aug
|
Sep
(39) |
Oct
(11) |
Nov
(3) |
Dec
(3) |
| 2024 |
Jan
(19) |
Feb
(20) |
Mar
(15) |
Apr
(12) |
May
(2) |
Jun
(12) |
Jul
(4) |
Aug
(9) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2025 |
Jan
(72) |
Feb
(80) |
Mar
(92) |
Apr
(35) |
May
(19) |
Jun
(26) |
Jul
(27) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Garvin H. <gar...@us...> - 2004-04-02 08:44:59
|
Update of /cvsroot/php-blog/serendipity/templates/mt-rusty In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28775/templates/mt-rusty Added Files: inactive.txt Log Message: Do not show our "temporary" styles until they are finished. --- NEW FILE: inactive.txt --- This template is under maintainance. If you want to use it, delete this file. |
|
From: Garvin H. <gar...@us...> - 2004-04-02 08:44:58
|
Update of /cvsroot/php-blog/serendipity/templates/mt-gettysburg In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28775/templates/mt-gettysburg Added Files: inactive.txt Log Message: Do not show our "temporary" styles until they are finished. --- NEW FILE: inactive.txt --- This template is under maintainance. If you want to use it, delete this file. |
|
From: Garvin H. <gar...@us...> - 2004-04-02 08:44:58
|
Update of /cvsroot/php-blog/serendipity/templates/mt-georgiablue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28775/templates/mt-georgiablue Added Files: inactive.txt Log Message: Do not show our "temporary" styles until they are finished. --- NEW FILE: inactive.txt --- This template is under maintainance. If you want to use it, delete this file. |
|
From: Garvin H. <gar...@us...> - 2004-04-02 08:44:58
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28775 Modified Files: NEWS serendipity_functions.inc.php Log Message: Do not show our "temporary" styles until they are finished. Index: serendipity_functions.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v retrieving revision 1.244 retrieving revision 1.245 diff -u -d -r1.244 -r1.245 --- serendipity_functions.inc.php 1 Apr 2004 10:05:59 -0000 1.244 +++ serendipity_functions.inc.php 2 Apr 2004 08:32:51 -0000 1.245 @@ -114,8 +114,8 @@ function serendipity_fetchTemplates() { global $serendipity; $dir = opendir($serendipity['serendipityPath'] . $serendipity['templatePath']); - while ( ($file = readdir($dir)) !== false ) { - if ( is_dir($serendipity['serendipityPath'] . $serendipity['templatePath'] . $file) && !ereg('^(\.|CVS)', $file) ) { + while (($file = readdir($dir)) !== false) { + if (is_dir($serendipity['serendipityPath'] . $serendipity['templatePath'] . $file) && !ereg('^(\.|CVS)', $file) && !file_exists($serendipity['serendipityPath'] . $serendipity['templatePath'] . $file . '/inactive.txt') && file_exists($serendipity['serendipityPath'] . $serendipity['templatePath'] . $file . '/info.txt')) { $rv[] = $file; } } @@ -289,7 +289,7 @@ function serendipity_rememberCommentDetails($details) { global $serendipity; - + foreach ($details as $n => $v) { serendipity_setCookie($n, $v); } @@ -299,7 +299,7 @@ if (!$serendipity['COOKIE']) { return; } - + foreach ($keys AS $n) { serendipity_deleteCookie($n); } @@ -315,7 +315,7 @@ } $bow = (int)$bow; - + // Catch faulty month if ($month<1) { $month = 1; @@ -327,7 +327,7 @@ $nrOfDays = date('t', $ts); $firstDayWeekDay = date('w', $ts); - // Calculate the first day of the week, based on the beginning of the week ($bow) + // 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 ) { @@ -517,7 +517,7 @@ global $serendipity; $and = ''; - + if ($full === true) { $body = ', e.body, e.extended'; } else { @@ -527,7 +527,7 @@ if ($fetchDrafts === false) { $drafts = "isdraft = 'false'"; } - + if ($limit != '') { $serendipity['fetchLimit'] = $limit; } @@ -562,7 +562,7 @@ $orderby = 'last_modified'; } } - + if (!empty($drafts)) { if (!empty($and)) { $and .= " AND $drafts"; @@ -924,7 +924,7 @@ <div class="serendipity_commentsTitle"><?php echo implode('<br />', $serendipity['messagestack']['comments']); ?></div> <?php } - + if (isset($serendipity['GET']['csuccess']) && $serendipity['GET']['csuccess'] == 'true') { ?> <br /> @@ -1093,7 +1093,7 @@ <?php echo $body; ?><br /> <div class="serendipity_comment_source"> - <a href="#c<?php echo $comment['id']; ?>" title="<?php echo LINK_TO_COMMENT . $x; ?>">#<?php echo $x ; ?></a> + <a href="#c<?php echo $comment['id']; ?>" title="<?php echo LINK_TO_COMMENT . $x; ?>">#<?php echo $x ; ?></a> <?php /* Link to the user's email */ if (!empty($comment['email'])) { @@ -1125,7 +1125,7 @@ if (!isset($comment)) { $comment = array('entry_id' => $serendipity['GET']['id']); } - + if (serendipity_db_bool($allow_comments)) { echo '<div class="serendipity_comment_source">(<a href="' . $serendipity['baseURL'] . 'comment.php?serendipity[switch]=disable&serendipity[entry]=' . $comment['entry_id'] . '">' . COMMENTS_DISABLE . '</a>)</div>'; } else { @@ -1302,7 +1302,7 @@ if (empty($fromName)) { $fromName = ANONYMOUS; } - + $entryURI = serendipity_archiveURL($id, $title); if ($type == 'TRACKBACK') { @@ -1347,14 +1347,14 @@ if ($comments == true) { $guid .= '#c' . $entry['commentid']; } - + return $guid; } // jbalcorn: starter function to clean up xhtml for atom feed. Add things to this as we find common // mistakes, unless someone finds a better way to do this. // DONE: -// since someone encoded all the urls, we can now assume any amp followed by +// since someone encoded all the urls, we can now assume any amp followed by // whitespace or a HTML tag (i.e. &<br /> )should be // encoded and most not with a space are intentional // TODO: @@ -1381,12 +1381,12 @@ if (is_array($entries)) { foreach ($entries as $entry) { $guid = serendipity_rss_getguid($entry, $comments); - + if ($comments == true) { // Display username as part of the title for easier feed-readability $entry['title'] = $entry['username'] . ': ' . $entry['title']; } - + // Embed a link to extended entry, if existing if ($entry['exflag']) { $ext = '<br /><a href="' . $guid . '#extended">' . VIEW_EXTENDED_ENTRY . '</a>'; @@ -1400,7 +1400,7 @@ // jbalcorn: clean up body for XML compliance as best we can. $entry['body'] = xhtml_cleanup($entry['body']); serendipity_plugin_api::hook_event('frontend_display', $entry); - + // extract author information if (empty($entry['email'])) { $query = "select email from {$serendipity['dbPrefix']}authors where username='{$entry['username']}'"; @@ -1417,7 +1417,7 @@ <name><?php echo utf8_encode(htmlspecialchars($entry['username'])); ?></name> <email><?php echo utf8_encode(htmlspecialchars($entry['email'])); ?></email> </author> - + <issued><?php echo gmdate('Y-m-d\TH:i:s\Z', $entry['timestamp']); ?></issued> <created><?php echo gmdate('Y-m-d\TH:i:s\Z', $entry['timestamp']); ?></created> <modified><?php echo gmdate('Y-m-d\TH:i:s\Z', $entry['last_modified']); ?></modified> @@ -1451,7 +1451,7 @@ <link><?php echo $guid; ?></link> <?php /*********** END RSS 0.91/2.0 FEED *************/ - + if ($version == '2.0') { /*********** RSS 2.0 FEED EXTRAS *************/ ?> @@ -1510,7 +1510,7 @@ <?php } ?> -</item> +</item> <?php } } @@ -1805,7 +1805,7 @@ if($locations[$i][0] == '/') { $locations[$i] = 'http://' . $_SERVER['HTTP_HOST'] . $locations[$i]; } - + $query = "SELECT COUNT(id) FROM {$serendipity['dbPrefix']}references WHERE "; $query .= "entry_id=$tmpid AND link='" . serendipity_db_escape_string($locations[$i]) . "'"; @@ -1850,7 +1850,7 @@ if (!is_numeric($entry['timestamp'])) { $entry['timestamp'] = time(); } - + if (!isset($entry['last_modified']) || !is_numeric($entry['last_modified'])) { $entry['last_modified'] = time(); } @@ -2095,7 +2095,7 @@ <textarea style="width: 100%" name="serendipity[extended]" id="serendipity[extended]" cols="80" rows="20"><?php echo isset($entry['extended']) ? htmlentities($entry['extended']) : ''; ?></textarea> </td> </tr> - + <tr> <td colspan="3"> <br /> @@ -2134,7 +2134,7 @@ if ($is_md5 === false) { $password = md5($password); } - + $query = "SELECT DISTINCT email, authorid FROM @@ -2143,7 +2143,7 @@ username = '$username' AND password = '$password'"; $row = serendipity_db_query($query, true, 'assoc'); - + if (is_array($row)) { $_SESSION['serendipityUser'] = $serendipity['serendipityUser'] = $username; $_SESSION['serendipityPassword'] = $serendipity['serendipityPassword'] = $password; @@ -2156,7 +2156,7 @@ session_destroy(); } } - + return false; } @@ -2238,7 +2238,7 @@ } else { $interval = "interval '900'"; } - + $gc = "DELETE FROM $serendipity[dbPrefix]suppress where last < now() - $interval"; serendipity_db_query($gc); } @@ -2362,12 +2362,12 @@ "\n", "'" ), - + array( '\n', "\'", ), - + file_get_contents($serendipity['serendipityPath'] . serendipity_getTemplateFile('htmlarea.css')) ); ?> @@ -2544,7 +2544,7 @@ break; } } - + return $ver; } Index: NEWS =================================================================== RCS file: /cvsroot/php-blog/serendipity/NEWS,v retrieving revision 1.101 retrieving revision 1.102 diff -u -d -r1.101 -r1.102 --- NEWS 1 Apr 2004 14:19:01 -0000 1.101 +++ NEWS 2 Apr 2004 08:32:51 -0000 1.102 @@ -3,6 +3,10 @@ Version 0.6 () ------------------------------------------------------------------------ + * Templates with an "inactive.txt" or no "info.txt" inside their + directory are not selectable for s9y. Usable for "work in progress" + templates. (garvinhicking) + * Fixed $su link for users with no URL rewriting (garvinhicking) * Fixed invalid XML for RDF trackback:ping (garvinhicking) |
|
From: Garvin H. <gar...@us...> - 2004-04-02 08:44:58
|
Update of /cvsroot/php-blog/serendipity/templates/mt-clean In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28775/templates/mt-clean Added Files: inactive.txt Log Message: Do not show our "temporary" styles until they are finished. --- NEW FILE: inactive.txt --- This template is under maintainance. If you want to use it, delete this file. |
|
From: Garvin H. <gar...@us...> - 2004-04-02 08:44:58
|
Update of /cvsroot/php-blog/serendipity/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28775/templates Modified Files: HOWTO Log Message: Do not show our "temporary" styles until they are finished. Index: HOWTO =================================================================== RCS file: /cvsroot/php-blog/serendipity/templates/HOWTO,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- HOWTO 8 Jul 2003 11:59:49 -0000 1.3 +++ HOWTO 2 Apr 2004 08:32:52 -0000 1.4 @@ -16,5 +16,9 @@ Contains the information about the current theme. Things like Name, Author and Release Date should be put here. Make sure format this file so that it is valid. Oherwise your theme will not show up correctly in the theme page +* inactive.txt + If this file exists (no matter what its contents) the template will not + be available to be chosen. Remove the file to test and work on the template. + Generally you can just copy the default folder and name it something else. Thereby you have a basis for a new theme and can now begin to modify the default theme to your liking. |
|
From: Garvin H. <gar...@us...> - 2004-04-01 14:31:00
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24855 Modified Files: NEWS serendipity_sidebar_items.php Log Message: Fixed link to superuser login for users with no URL rewriting Index: serendipity_sidebar_items.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v retrieving revision 1.51 retrieving revision 1.52 diff -u -d -r1.51 -r1.52 --- serendipity_sidebar_items.php 21 Mar 2004 16:26:56 -0000 1.51 +++ serendipity_sidebar_items.php 1 Apr 2004 14:19:01 -0000 1.52 @@ -49,7 +49,7 @@ 4 ), $this->get_config('beginningOfWeek') - + ); } } @@ -263,7 +263,7 @@ global $serendipity; $title = SYNDICATE_THIS_BLOG; - + if ($this->get_config('prevent_cache') == 'true') { $cache = '&nocache=true'; } else { @@ -277,7 +277,7 @@ <br /> <?php } - + if ($this->get_config('show_1.0') != 'false') { ?> <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=1.0<?php echo $cache; ?>"><img src="<?php echo serendipity_getTemplateFile('img/xml.gif'); ?>" <?php echo ($serendipity['XHTML11'] ? 'style="border: 0px"' : 'border="0"'); ?> alt="XML" /></a> @@ -401,7 +401,7 @@ global $serendipity; $title = SUPERUSER . ':'; - echo "<a href=\"{$serendipity['serendipityHTTPPath']}" . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_ENTRIES."\" title=\"$title\">\$ su -</a>"; + echo "<a href=\"{$serendipity['serendipityHTTPPath']}" . ($serendipity['rewrite'] == 'none' ? 'serendipity_entries.php?/' : '') . PATH_ENTRIES."\" title=\"$title\">\$ su -</a>"; } } @@ -452,7 +452,7 @@ $propbag->add('name', CONTENT); $propbag->add('description', THE_NUGGET); break; - + case 'markup': $propbag->add('type', 'boolean'); $propbag->add('name', DO_MARKUP); Index: NEWS =================================================================== RCS file: /cvsroot/php-blog/serendipity/NEWS,v retrieving revision 1.100 retrieving revision 1.101 diff -u -d -r1.100 -r1.101 --- NEWS 1 Apr 2004 10:05:58 -0000 1.100 +++ NEWS 1 Apr 2004 14:19:01 -0000 1.101 @@ -3,6 +3,8 @@ Version 0.6 () ------------------------------------------------------------------------ + * Fixed $su link for users with no URL rewriting (garvinhicking) + * Fixed invalid XML for RDF trackback:ping (garvinhicking) * Added plugin 'serendipity_event_statistics'. Hooks into the |
|
From: Garvin H. <gar...@us...> - 2004-04-01 10:17:57
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5102 Modified Files: NEWS serendipity_functions.inc.php Log Message: fixed bad xml formatting for embedded RDF. Thanks to Henryk Plötz for discovering... Index: serendipity_functions.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v retrieving revision 1.243 retrieving revision 1.244 diff -u -d -r1.243 -r1.244 --- serendipity_functions.inc.php 29 Mar 2004 07:52:04 -0000 1.243 +++ serendipity_functions.inc.php 1 Apr 2004 10:05:59 -0000 1.244 @@ -882,8 +882,8 @@ xmlns:dc="http://purl.org/dc/elements/1.1/"> <rdf:Description rdf:about="<?php echo $serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : ''); ?>feeds/ei_<?php echo $entry['id']; ?>.rdf" - trackback:ping="<?php echo $serendipity['baseURL']; ?>comment.php?type=trackback&entry_id=<?php echo $entry['id']; ?>" - dc:title="<?php echo $entry['title']; ?>" + trackback:ping="<?php echo $serendipity['baseURL']; ?>comment.php?type=trackback&entry_id=<?php echo $entry['id']; ?>" + dc:title="<?php echo htmlspecialchars($entry['title']); ?>" dc:identifier="<?php echo serendipity_archiveURL($entry['id'], $entry['title']); ?>" /> </rdf:RDF> --> Index: NEWS =================================================================== RCS file: /cvsroot/php-blog/serendipity/NEWS,v retrieving revision 1.99 retrieving revision 1.100 diff -u -d -r1.99 -r1.100 --- NEWS 26 Mar 2004 16:47:22 -0000 1.99 +++ NEWS 1 Apr 2004 10:05:58 -0000 1.100 @@ -3,6 +3,8 @@ Version 0.6 () ------------------------------------------------------------------------ + * Fixed invalid XML for RDF trackback:ping (garvinhicking) + * Added plugin 'serendipity_event_statistics'. Hooks into the admin entry-panel. (garvinhicking) |
|
From: Garvin H. <gar...@us...> - 2004-03-30 08:15:25
|
Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_statistics In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2883 Modified Files: serendipity_event_statistics.php Log Message: Fixed issues reported by Tom, thanks. Index: serendipity_event_statistics.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_statistics/serendipity_event_statistics.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- serendipity_event_statistics.php 29 Mar 2004 07:18:12 -0000 1.3 +++ serendipity_event_statistics.php 30 Mar 2004 08:03:42 -0000 1.4 @@ -4,50 +4,52 @@ case 'de': @define('PLUGIN_EVENT_STATISTICS_NAME', 'Statistiken'); @define('PLUGIN_EVENT_STATISTICS_DESC', 'Zeigt einen Link zu Statistiken in der Autorenoberfläche'); - @define('PLUGIN_EVENT_OUT_STATISTICS', 'Statistik'); - @define('PLUGIN_EVENT_OUT_FIRST_ENTRY', 'Erster Eintrag'); - @define('PLUGIN_EVENT_OUT_LAST_ENTRY', 'Letzter Eintrag'); - @define('PLUGIN_EVENT_OUT_TOTAL_ENTRIES', 'Insgesamt verfasste Artikel'); - @define('PLUGIN_EVENT_OUT_ENTRIES', 'Artikel'); - @define('PLUGIN_EVENT_OUT_TOTAL_PUBLIC', ' ... davon öffentlich'); - @define('PLUGIN_EVENT_OUT_TOTAL_DRAFTS', ' ... davon Entwürfe'); - @define('PLUGIN_EVENT_OUT_CATEGORIES', 'Vorhandene Kategorien'); - @define('PLUGIN_EVENT_OUT_CATEGORIES2', 'Kategorie(n)'); - @define('PLUGIN_EVENT_OUT_DISTRIBUTION_CATEGORIES', 'Verteilung der Artikel auf Kategorien'); - @define('PLUGIN_EVENT_OUT_DISTRIBUTION_CATEGORIES2', 'eingetragene(r) Artikel'); - @define('PLUGIN_EVENT_OUT_UPLOADED_IMAGES', 'Hochgeladene Bilder'); - @define('PLUGIN_EVENT_OUT_UPLOADED_IMAGES2', 'Bild(er)'); - @define('PLUGIN_EVENT_OUT_DISTRIBUTION_IMAGES', 'Verteilung der Bild-Dateitypen'); - @define('PLUGIN_EVENT_OUT_DISTRIBUTION_IMAGES2', 'vorhandene Datei(en)'); - @define('PLUGIN_EVENT_OUT_COMMENTS', 'Erhaltene Kommentare'); - @define('PLUGIN_EVENT_OUT_COMMENTS2', 'Kommentar(e)'); - @define('PLUGIN_EVENT_OUT_COMMENTS3', 'Top kommentierte Artikel'); - @define('PLUGIN_EVENT_OUT_TOPCOMMENTS', 'Top Kommentatoren'); - @define('PLUGIN_EVENT_OUT_LINK', 'Link'); - @define('PLUGIN_EVENT_OUT_SUBSCRIBERS', 'Abonnenten'); - @define('PLUGIN_EVENT_OUT_SUBSCRIBERS2', 'Abonnent(en)'); - @define('PLUGIN_EVENT_OUT_TOPSUBSCRIBERS', 'Top abonnierte Artikel'); - @define('PLUGIN_EVENT_OUT_TOPSUBSCRIBERS2', 'eingetragene(r) Abonnent(en)'); - @define('PLUGIN_EVENT_OUT_TRACKBACKS', 'Erhaltene Trackbacks'); - @define('PLUGIN_EVENT_OUT_TRACKBACKS2', 'Trackback(s)'); - @define('PLUGIN_EVENT_OUT_TOPTRACKBACK', 'Top Trackback-Artikel'); - @define('PLUGIN_EVENT_OUT_TOPTRACKBACK2', 'eingetragene(r) Trackback(s)'); - @define('PLUGIN_EVENT_OUT_TOPTRACKBACKS3', 'Top Trackbacker'); - @define('PLUGIN_EVENT_OUT_COMMENTS_PER_ARTICLE', 'Durchschnittliche Kommentare pro Artikel'); - @define('PLUGIN_EVENT_OUT_TRACKBACKS_PER_ARTICLE', 'Durchschnittliche Trackbacks pro Artikel'); - @define('PLUGIN_EVENT_OUT_ARTICLES_PER_DAY', 'Durchschnittliche Artikel pro Tag'); - @define('PLUGIN_EVENT_OUT_ARTICLES_PER_WEEK', 'Durchschnittliche Artikel pro Woche'); - @define('PLUGIN_EVENT_OUT_ARTICLES_PER_MONTH', 'Durchschnittliche Artikel pro Monat'); - @define('PLUGIN_EVENT_OUT_COMMENTS_PER_ARTICLE2', 'Kommentare/Artikel'); - @define('PLUGIN_EVENT_OUT_TRACKBACKS_PER_ARTICLE2', 'Trackbacks/Artikel'); - @define('PLUGIN_EVENT_OUT_ARTICLES_PER_DAY2', 'Artikel/Tag'); - @define('PLUGIN_EVENT_OUT_ARTICLES_PER_WEEK2', 'Artikel/Woche'); - @define('PLUGIN_EVENT_OUT_ARTICLES_PER_MONTH2', 'Artikel/Monat'); - @define('PLUGIN_EVENT_OUT_CHARS', 'Menge der verfassten Zeichen'); - @define('PLUGIN_EVENT_OUT_CHARS2', 'Zeichen'); - @define('PLUGIN_EVENT_OUT_CHARS_PER_ARTICLE', 'Zeichen pro Artikel'); - @define('PLUGIN_EVENT_OUT_CHARS_PER_ARTICLE2', 'Zeichen/Artikel'); - @define('PLUGIN_EVENT_OUT_LONGEST_ARTICLES', 'Die %s längsten Artikel'); + @define('PLUGIN_EVENT_STATISTICS_OUT_STATISTICS', 'Statistik'); + @define('PLUGIN_EVENT_STATISTICS_OUT_FIRST_ENTRY', 'Erster Eintrag'); + @define('PLUGIN_EVENT_STATISTICS_OUT_LAST_ENTRY', 'Letzter Eintrag'); + @define('PLUGIN_EVENT_STATISTICS_OUT_TOTAL_ENTRIES', 'Insgesamt verfasste Artikel'); + @define('PLUGIN_EVENT_STATISTICS_OUT_ENTRIES', 'Artikel'); + @define('PLUGIN_EVENT_STATISTICS_OUT_TOTAL_PUBLIC', ' ... davon öffentlich'); + @define('PLUGIN_EVENT_STATISTICS_OUT_TOTAL_DRAFTS', ' ... davon Entwürfe'); + @define('PLUGIN_EVENT_STATISTICS_OUT_CATEGORIES', 'Vorhandene Kategorien'); + @define('PLUGIN_EVENT_STATISTICS_OUT_CATEGORIES2', 'Kategorie(n)'); + @define('PLUGIN_EVENT_STATISTICS_OUT_DISTRIBUTION_CATEGORIES', 'Verteilung der Artikel auf Kategorien'); + @define('PLUGIN_EVENT_STATISTICS_OUT_DISTRIBUTION_CATEGORIES2', 'eingetragene(r) Artikel'); + @define('PLUGIN_EVENT_STATISTICS_OUT_UPLOADED_IMAGES', 'Hochgeladene Bilder'); + @define('PLUGIN_EVENT_STATISTICS_OUT_UPLOADED_IMAGES2', 'Bild(er)'); + @define('PLUGIN_EVENT_STATISTICS_OUT_DISTRIBUTION_IMAGES', 'Verteilung der Bild-Dateitypen'); + @define('PLUGIN_EVENT_STATISTICS_OUT_DISTRIBUTION_IMAGES2', 'vorhandene Datei(en)'); + @define('PLUGIN_EVENT_STATISTICS_OUT_COMMENTS', 'Erhaltene Kommentare'); + @define('PLUGIN_EVENT_STATISTICS_OUT_COMMENTS2', 'Kommentar(e)'); + @define('PLUGIN_EVENT_STATISTICS_OUT_COMMENTS3', 'Top kommentierte Artikel'); + @define('PLUGIN_EVENT_STATISTICS_OUT_TOPCOMMENTS', 'Top Kommentatoren'); + @define('PLUGIN_EVENT_STATISTICS_OUT_LINK', 'Link'); + @define('PLUGIN_EVENT_STATISTICS_OUT_SUBSCRIBERS', 'Abonnenten'); + @define('PLUGIN_EVENT_STATISTICS_OUT_SUBSCRIBERS2', 'Abonnent(en)'); + @define('PLUGIN_EVENT_STATISTICS_OUT_TOPSUBSCRIBERS', 'Top abonnierte Artikel'); + @define('PLUGIN_EVENT_STATISTICS_OUT_TOPSUBSCRIBERS2', 'eingetragene(r) Abonnent(en)'); + @define('PLUGIN_EVENT_STATISTICS_OUT_TRACKBACKS', 'Erhaltene Trackbacks'); + @define('PLUGIN_EVENT_STATISTICS_OUT_TRACKBACKS2', 'Trackback(s)'); + @define('PLUGIN_EVENT_STATISTICS_OUT_TOPTRACKBACK', 'Top Trackback-Artikel'); + @define('PLUGIN_EVENT_STATISTICS_OUT_TOPTRACKBACK2', 'eingetragene(r) Trackback(s)'); + @define('PLUGIN_EVENT_STATISTICS_OUT_TOPTRACKBACKS3', 'Top Trackbacker'); + @define('PLUGIN_EVENT_STATISTICS_OUT_COMMENTS_PER_ARTICLE', 'Durchschnittliche Kommentare pro Artikel'); + @define('PLUGIN_EVENT_STATISTICS_OUT_TRACKBACKS_PER_ARTICLE', 'Durchschnittliche Trackbacks pro Artikel'); + @define('PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_DAY', 'Durchschnittliche Artikel pro Tag'); + @define('PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_WEEK', 'Durchschnittliche Artikel pro Woche'); + @define('PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_MONTH', 'Durchschnittliche Artikel pro Monat'); + @define('PLUGIN_EVENT_STATISTICS_OUT_COMMENTS_PER_ARTICLE2', 'Kommentare/Artikel'); + @define('PLUGIN_EVENT_STATISTICS_OUT_TRACKBACKS_PER_ARTICLE2', 'Trackbacks/Artikel'); + @define('PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_DAY2', 'Artikel/Tag'); + @define('PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_WEEK2', 'Artikel/Woche'); + @define('PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_MONTH2', 'Artikel/Monat'); + @define('PLUGIN_EVENT_STATISTICS_OUT_CHARS', 'Menge der verfassten Zeichen'); + @define('PLUGIN_EVENT_STATISTICS_OUT_CHARS2', 'Zeichen'); + @define('PLUGIN_EVENT_STATISTICS_OUT_CHARS_PER_ARTICLE', 'Zeichen pro Artikel'); + @define('PLUGIN_EVENT_STATISTICS_OUT_CHARS_PER_ARTICLE2', 'Zeichen/Artikel'); + @define('PLUGIN_EVENT_STATISTICS_OUT_LONGEST_ARTICLES', 'Die %s längsten Artikel'); + @define('PLUGIN_EVENT_STATISTICS_MAX_ITEMS', 'Anzahl Einträge'); + @define('PLUGIN_EVENT_STATISTICS_MAX_ITEMS_DESC', 'Wieviele Einträge sollen pro Wert dargestellt werden? (Standard: 20)'); break; case 'en': @@ -55,50 +57,52 @@ default: @define('PLUGIN_EVENT_STATISTICS_NAME', 'Statistics'); @define('PLUGIN_EVENT_STATISTICS_DESC', 'Display a link to statistics in entries-panel'); - @define('PLUGIN_EVENT_OUT_STATISTICS', 'Statistics'); - @define('PLUGIN_EVENT_OUT_FIRST_ENTRY', 'First entry'); - @define('PLUGIN_EVENT_OUT_LAST_ENTRY', 'Last entry'); - @define('PLUGIN_EVENT_OUT_TOTAL_ENTRIES', 'Total entries'); - @define('PLUGIN_EVENT_OUT_ENTRIES', 'entries'); - @define('PLUGIN_EVENT_OUT_TOTAL_PUBLIC', ' ... public'); - @define('PLUGIN_EVENT_OUT_TOTAL_DRAFTS', ' ... drafts'); - @define('PLUGIN_EVENT_OUT_CATEGORIES', 'Categories'); - @define('PLUGIN_EVENT_OUT_CATEGORIES2', 'categories'); - @define('PLUGIN_EVENT_OUT_DISTRIBUTION_CATEGORIES', 'Distribution of entries'); - @define('PLUGIN_EVENT_OUT_DISTRIBUTION_CATEGORIES2', 'entry'); - @define('PLUGIN_EVENT_OUT_UPLOADED_IMAGES', 'Uploaded images'); - @define('PLUGIN_EVENT_OUT_UPLOADED_IMAGES2', 'image(s)'); - @define('PLUGIN_EVENT_OUT_DISTRIBUTION_IMAGES', 'Distribution of image types'); - @define('PLUGIN_EVENT_OUT_DISTRIBUTION_IMAGES2', 'file(s)'); - @define('PLUGIN_EVENT_OUT_COMMENTS', 'Received comments'); - @define('PLUGIN_EVENT_OUT_COMMENTS2', 'comment(s)'); - @define('PLUGIN_EVENT_OUT_COMMENTS3', 'Most frequently commented entries'); - @define('PLUGIN_EVENT_OUT_TOPCOMMENTS', 'Most frequently commenting people'); - @define('PLUGIN_EVENT_OUT_LINK', 'link'); - @define('PLUGIN_EVENT_OUT_SUBSCRIBERS', 'Subscribers'); - @define('PLUGIN_EVENT_OUT_SUBSCRIBERS2', 'subscriber(s)'); - @define('PLUGIN_EVENT_OUT_TOPSUBSCRIBERS', 'Most frequently subscribed entries'); - @define('PLUGIN_EVENT_OUT_TOPSUBSCRIBERS2', 'subscriber(s)'); - @define('PLUGIN_EVENT_OUT_TRACKBACKS', 'Received trackbacks'); - @define('PLUGIN_EVENT_OUT_TRACKBACKS2', 'trackback(s)'); - @define('PLUGIN_EVENT_OUT_TOPTRACKBACK', 'Most frequently trackbacked entires'); - @define('PLUGIN_EVENT_OUT_TOPTRACKBACK2', 'trackback(s)'); - @define('PLUGIN_EVENT_OUT_TOPTRACKBACKS3', 'Most frequently trackbacking people'); - @define('PLUGIN_EVENT_OUT_COMMENTS_PER_ARTICLE', 'estimated comments per entry'); - @define('PLUGIN_EVENT_OUT_TRACKBACKS_PER_ARTICLE', 'estimated trackbacks per entry'); - @define('PLUGIN_EVENT_OUT_ARTICLES_PER_DAY', 'estimated entries per day'); - @define('PLUGIN_EVENT_OUT_ARTICLES_PER_WEEK', 'estimated entries per week'); - @define('PLUGIN_EVENT_OUT_ARTICLES_PER_MONTH', 'estimated entries per month'); - @define('PLUGIN_EVENT_OUT_COMMENTS_PER_ARTICLE2', 'comments/entries'); - @define('PLUGIN_EVENT_OUT_TRACKBACKS_PER_ARTICLE2', 'trackbacks/entry'); - @define('PLUGIN_EVENT_OUT_ARTICLES_PER_DAY2', 'entries/day'); - @define('PLUGIN_EVENT_OUT_ARTICLES_PER_WEEK2', 'entries/week'); - @define('PLUGIN_EVENT_OUT_ARTICLES_PER_MONTH2', 'entries/month'); - @define('PLUGIN_EVENT_OUT_CHARS', 'Total amount of characters'); - @define('PLUGIN_EVENT_OUT_CHARS2', 'characters'); - @define('PLUGIN_EVENT_OUT_CHARS_PER_ARTICLE', 'Characters per entry'); - @define('PLUGIN_EVENT_OUT_CHARS_PER_ARTICLE2', 'chars/entry'); - @define('PLUGIN_EVENT_OUT_LONGEST_ARTICLES', 'The %s longest entries'); + @define('PLUGIN_EVENT_STATISTICS_OUT_STATISTICS', 'Statistics'); + @define('PLUGIN_EVENT_STATISTICS_OUT_FIRST_ENTRY', 'First entry'); + @define('PLUGIN_EVENT_STATISTICS_OUT_LAST_ENTRY', 'Last entry'); + @define('PLUGIN_EVENT_STATISTICS_OUT_TOTAL_ENTRIES', 'Total entries'); + @define('PLUGIN_EVENT_STATISTICS_OUT_ENTRIES', 'entries'); + @define('PLUGIN_EVENT_STATISTICS_OUT_TOTAL_PUBLIC', ' ... public'); + @define('PLUGIN_EVENT_STATISTICS_OUT_TOTAL_DRAFTS', ' ... drafts'); + @define('PLUGIN_EVENT_STATISTICS_OUT_CATEGORIES', 'Categories'); + @define('PLUGIN_EVENT_STATISTICS_OUT_CATEGORIES2', 'categories'); + @define('PLUGIN_EVENT_STATISTICS_OUT_DISTRIBUTION_CATEGORIES', 'Distribution of entries'); + @define('PLUGIN_EVENT_STATISTICS_OUT_DISTRIBUTION_CATEGORIES2', 'entry'); + @define('PLUGIN_EVENT_STATISTICS_OUT_UPLOADED_IMAGES', 'Uploaded images'); + @define('PLUGIN_EVENT_STATISTICS_OUT_UPLOADED_IMAGES2', 'image(s)'); + @define('PLUGIN_EVENT_STATISTICS_OUT_DISTRIBUTION_IMAGES', 'Distribution of image types'); + @define('PLUGIN_EVENT_STATISTICS_OUT_DISTRIBUTION_IMAGES2', 'file(s)'); + @define('PLUGIN_EVENT_STATISTICS_OUT_COMMENTS', 'Received comments'); + @define('PLUGIN_EVENT_STATISTICS_OUT_COMMENTS2', 'comment(s)'); + @define('PLUGIN_EVENT_STATISTICS_OUT_COMMENTS3', 'Most frequently commented entries'); + @define('PLUGIN_EVENT_STATISTICS_OUT_TOPCOMMENTS', 'Most frequently commenting people'); + @define('PLUGIN_EVENT_STATISTICS_OUT_LINK', 'link'); + @define('PLUGIN_EVENT_STATISTICS_OUT_SUBSCRIBERS', 'Subscribers'); + @define('PLUGIN_EVENT_STATISTICS_OUT_SUBSCRIBERS2', 'subscriber(s)'); + @define('PLUGIN_EVENT_STATISTICS_OUT_TOPSUBSCRIBERS', 'Most frequently subscribed entries'); + @define('PLUGIN_EVENT_STATISTICS_OUT_TOPSUBSCRIBERS2', 'subscriber(s)'); + @define('PLUGIN_EVENT_STATISTICS_OUT_TRACKBACKS', 'Received trackbacks'); + @define('PLUGIN_EVENT_STATISTICS_OUT_TRACKBACKS2', 'trackback(s)'); + @define('PLUGIN_EVENT_STATISTICS_OUT_TOPTRACKBACK', 'Most frequently trackbacked entires'); + @define('PLUGIN_EVENT_STATISTICS_OUT_TOPTRACKBACK2', 'trackback(s)'); + @define('PLUGIN_EVENT_STATISTICS_OUT_TOPTRACKBACKS3', 'Most frequently trackbacking people'); + @define('PLUGIN_EVENT_STATISTICS_OUT_COMMENTS_PER_ARTICLE', 'estimated comments per entry'); + @define('PLUGIN_EVENT_STATISTICS_OUT_TRACKBACKS_PER_ARTICLE', 'estimated trackbacks per entry'); + @define('PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_DAY', 'estimated entries per day'); + @define('PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_WEEK', 'estimated entries per week'); + @define('PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_MONTH', 'estimated entries per month'); + @define('PLUGIN_EVENT_STATISTICS_OUT_COMMENTS_PER_ARTICLE2', 'comments/entries'); + @define('PLUGIN_EVENT_STATISTICS_OUT_TRACKBACKS_PER_ARTICLE2', 'trackbacks/entry'); + @define('PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_DAY2', 'entries/day'); + @define('PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_WEEK2', 'entries/week'); + @define('PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_MONTH2', 'entries/month'); + @define('PLUGIN_EVENT_STATISTICS_OUT_CHARS', 'Total amount of characters'); + @define('PLUGIN_EVENT_STATISTICS_OUT_CHARS2', 'characters'); + @define('PLUGIN_EVENT_STATISTICS_OUT_CHARS_PER_ARTICLE', 'Characters per entry'); + @define('PLUGIN_EVENT_STATISTICS_OUT_CHARS_PER_ARTICLE2', 'chars/entry'); + @define('PLUGIN_EVENT_STATISTICS_OUT_LONGEST_ARTICLES', 'The %s longest entries'); + @define('PLUGIN_EVENT_STATISTICS_MAX_ITEMS', 'Maximum items'); + @define('PLUGIN_EVENT_STATISTICS_MAX_ITEMS_DESC', 'How many items to display per statistical value? (Default: 20)'); break; } @@ -115,10 +119,19 @@ 'backend_sidebar_entries_event_display_statistics' => true )); + $propbag->add('configuration', array('max_items')); } function introspect_config_item($name, &$propbag) { + switch($name) { + case 'max_items': + $propbag->add('type', 'string'); + $propbag->add('name', PLUGIN_EVENT_STATISTICS_MAX_ITEMS); + $propbag->add('description', PLUGIN_EVENT_STATISTICS_MAX_ITEMS_DESC); + break; + } + return true; } @@ -143,6 +156,12 @@ break; case 'backend_sidebar_entries_event_display_statistics': + $max_items = $this->get_config('max_items'); + + if (!$max_items || !is_numeric($max_items) || $max_items < 1) { + $max_items = 20; + } + $first_entry = serendipity_db_query("SELECT timestamp FROM {$serendipity['dbPrefix']}entries ORDER BY timestamp ASC limit 1", true); $last_entry = serendipity_db_query("SELECT timestamp FROM {$serendipity['dbPrefix']}entries ORDER BY timestamp DESC limit 1", true); $total_count = serendipity_db_query("SELECT count(id) FROM {$serendipity['dbPrefix']}entries", true); @@ -165,7 +184,8 @@ {$serendipity['dbPrefix']}entries e WHERE e.id = c.entry_id AND type = 'NORMAL' AND subscribed = 'true' GROUP BY e.id, c.email - ORDER BY postings DESC"); + ORDER BY postings DESC + LIMIT $max_items"); $comment_count = serendipity_db_query("SELECT count(id) FROM {$serendipity['dbPrefix']}comments WHERE type = 'NORMAL'", true); $comment_rows = serendipity_db_query("SELECT e.id, e.title, count(c.id) as postings @@ -173,13 +193,15 @@ {$serendipity['dbPrefix']}entries e WHERE e.id = c.entry_id AND type = 'NORMAL' GROUP BY e.id - ORDER BY postings DESC"); + ORDER BY postings DESC + LIMIT $max_items"); $commentor_rows = serendipity_db_query("SELECT author, email, url, count(id) as postings FROM {$serendipity['dbPrefix']}comments c WHERE type = 'NORMAL' GROUP BY author - ORDER BY postings DESC"); + ORDER BY postings DESC + LIMIT $max_items"); $tb_count = serendipity_db_query("SELECT count(id) FROM {$serendipity['dbPrefix']}comments WHERE type = 'TRACKBACK'", true); $tb_rows = serendipity_db_query("SELECT e.id, e.title, count(c.id) as postings @@ -187,57 +209,59 @@ {$serendipity['dbPrefix']}entries e WHERE e.id = c.entry_id AND type = 'TRACKBACK' GROUP BY e.id - ORDER BY postings DESC"); + ORDER BY postings DESC + LIMIT $max_items"); $tbr_rows = serendipity_db_query("SELECT author, email, url, count(id) as postings FROM {$serendipity['dbPrefix']}comments c WHERE type = 'TRACKBACK' GROUP BY author - ORDER BY postings DESC"); + ORDER BY postings DESC + LIMIT $max_items"); $length = serendipity_db_query("SELECT SUM(LENGTH(body) + LENGTH(extended)) FROM {$serendipity['dbPrefix']}entries", true); - $length_rows = serendipity_db_query("SELECT id, title, (LENGTH(body) + LENGTH(extended)) as full_length FROM {$serendipity['dbPrefix']}entries ORDER BY full_length DESC LIMIT 5"); + $length_rows = serendipity_db_query("SELECT id, title, (LENGTH(body) + LENGTH(extended)) as full_length FROM {$serendipity['dbPrefix']}entries ORDER BY full_length DESC LIMIT $max_items"); ?> - <h3><?php echo PLUGIN_EVENT_OUT_STATISTICS; ?></h3> + <h3><?php echo PLUGIN_EVENT_STATISTICS_OUT_STATISTICS; ?></h3> <div style="margin: 5px; padding: 5px"> <dl> - <dt><strong><?php echo PLUGIN_EVENT_OUT_FIRST_ENTRY; ?></strong></dt> + <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_FIRST_ENTRY; ?></strong></dt> <dd><?php echo ucfirst(strftime(DATE_FORMAT_ENTRY . ' %H:%m', $first_entry[0])); ?></dd> <br /> - <dt><strong><?php echo PLUGIN_EVENT_OUT_LAST_ENTRY; ?></strong></dt> + <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_LAST_ENTRY; ?></strong></dt> <dd><?php echo ucfirst(strftime(DATE_FORMAT_ENTRY . ' %H:%m', $last_entry[0])); ?></dd> <br /> <hr /> <br /> - <dt><strong><?php echo PLUGIN_EVENT_OUT_TOTAL_ENTRIES; ?></strong></dt> - <dd><?php echo $total_count[0]; ?> <?php echo PLUGIN_EVENT_OUT_ENTRIES; ?></dd> + <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_TOTAL_ENTRIES; ?></strong></dt> + <dd><?php echo $total_count[0]; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_ENTRIES; ?></dd> <br /> <dl> - <dt><strong><?php echo PLUGIN_EVENT_OUT_TOTAL_PUBLIC; ?></strong></dt> - <dd><?php echo $publish_count[0]; ?> <?php echo PLUGIN_EVENT_OUT_ENTRIES; ?></dd> - <dt><strong><?php echo PLUGIN_EVENT_OUT_TOTAL_DRAFTS; ?></strong></dt> - <dd><?php echo $draft_count[0]; ?> <?php echo PLUGIN_EVENT_OUT_ENTRIES; ?></dd> + <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_TOTAL_PUBLIC; ?></strong></dt> + <dd><?php echo $publish_count[0]; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_ENTRIES; ?></dd> + <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_TOTAL_DRAFTS; ?></strong></dt> + <dd><?php echo $draft_count[0]; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_ENTRIES; ?></dd> </dl> <br /> <hr /> <br /> - <dt><strong><?php echo PLUGIN_EVENT_OUT_CATEGORIES; ?></strong></dt> - <dd><?php echo $category_count[0]; ?> <?php echo PLUGIN_EVENT_OUT_CATEGORIES2; ?></dd> + <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_CATEGORIES; ?></strong></dt> + <dd><?php echo $category_count[0]; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_CATEGORIES2; ?></dd> <br /> - <dt><strong><?php echo PLUGIN_EVENT_OUT_DISTRIBUTION_CATEGORIES; ?></strong></dt> + <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_DISTRIBUTION_CATEGORIES; ?></strong></dt> <dl> <?php if (is_array($category_rows)) { foreach($category_rows AS $category => $cat_stat) { ?> <dt><strong><?php echo $cat_stat['category_name']; ?></strong></dt> - <dd><?php echo $cat_stat['postings']; ?> <?php echo PLUGIN_EVENT_OUT_DISTRIBUTION_CATEGORIES2; ?></dd> + <dd><?php echo $cat_stat['postings']; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_DISTRIBUTION_CATEGORIES2; ?></dd> <?php } } @@ -247,18 +271,18 @@ <hr /> <br /> - <dt><strong><?php echo PLUGIN_EVENT_OUT_UPLOADED_IMAGES; ?></strong></dt> - <dd><?php echo $image_count[0]; ?> <?php echo PLUGIN_EVENT_OUT_UPLOADED_IMAGES2; ?></dd> + <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_UPLOADED_IMAGES; ?></strong></dt> + <dd><?php echo $image_count[0]; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_UPLOADED_IMAGES2; ?></dd> <br /> - <dt><strong><?php echo PLUGIN_EVENT_OUT_DISTRIBUTION_IMAGES; ?></strong></dt> + <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_DISTRIBUTION_IMAGES; ?></strong></dt> <dl> <?php if (is_array($image_rows)) { foreach($image_rows AS $image => $image_stat) { ?> <dt><strong><?php echo $image_stat['extension']; ?></strong></dt> - <dd><?php echo $image_stat['images']; ?> <?php echo PLUGIN_EVENT_OUT_DISTRIBUTION_IMAGES2; ?></dd> + <dd><?php echo $image_stat['images']; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_DISTRIBUTION_IMAGES2; ?></dd> <?php } } @@ -268,18 +292,18 @@ <hr /> <br /> - <dt><strong><?php echo PLUGIN_EVENT_OUT_COMMENTS; ?></strong></dt> - <dd><?php echo $comment_count[0]; ?> <?php echo PLUGIN_EVENT_OUT_COMMENTS2; ?></dd> + <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_COMMENTS; ?></strong></dt> + <dd><?php echo $comment_count[0]; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_COMMENTS2; ?></dd> <br /> - <dt><strong><?php echo PLUGIN_EVENT_OUT_COMMENTS3; ?></strong></dt> + <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_COMMENTS3; ?></strong></dt> <dl> <?php if (is_array($comment_rows)) { foreach($comment_rows AS $comment => $com_stat) { ?> <dt><strong><a href="<?php echo serendipity_archiveURL($com_stat['id'], $com_stat['title'], 'serendipityHTTPPath'); ?>"><?php echo $com_stat['title']; ?></a></strong></dt> - <dd><?php echo $com_stat['postings']; ?> <?php echo PLUGIN_EVENT_OUT_COMMENTS2; ?></dd> + <dd><?php echo $com_stat['postings']; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_COMMENTS2; ?></dd> <?php } } @@ -287,14 +311,14 @@ </dl> <br /> - <dt><strong><?php echo PLUGIN_EVENT_OUT_TOPCOMMENTS; ?></strong></dt> + <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_TOPCOMMENTS; ?></strong></dt> <dl> <?php if (is_array($commentor_rows)) { foreach($commentor_rows AS $comment => $com_stat) { ?> - <dt><strong><a href="mailto:<?php echo $com_stat['email']; ?>"><?php echo $com_stat['author']; ?></a> (<a href="<?php echo $com_stat['url']; ?>"><?php echo PLUGIN_EVENT_OUT_LINK; ?></a>)</strong></dt> - <dd><?php echo $com_stat['postings']; ?> <?php echo PLUGIN_EVENT_OUT_COMMENTS2; ?></dd> + <dt><strong><a href="mailto:<?php echo $com_stat['email']; ?>"><?php echo $com_stat['author']; ?></a> (<a href="<?php echo $com_stat['url']; ?>"><?php echo PLUGIN_EVENT_STATISTICS_OUT_LINK; ?></a>)</strong></dt> + <dd><?php echo $com_stat['postings']; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_COMMENTS2; ?></dd> <?php } } @@ -304,18 +328,18 @@ <hr /> <br /> - <dt><strong><?php echo PLUGIN_EVENT_OUT_SUBSCRIBERS; ?></strong></dt> - <dd><?php echo $subscriber_count; ?> <?php echo PLUGIN_EVENT_OUT_SUBSCRIBERS2; ?></dd> + <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_SUBSCRIBERS; ?></strong></dt> + <dd><?php echo $subscriber_count; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_SUBSCRIBERS2; ?></dd> <br /> - <dt><strong><?php echo PLUGIN_EVENT_OUT_TOPSUBSCRIBERS; ?></strong></dt> + <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_TOPSUBSCRIBERS; ?></strong></dt> <dl> <?php if (is_array($subscriber_rows)) { foreach($subscriber_rows AS $subscriber => $subscriber_stat) { ?> <dt><strong><a href="<?php echo serendipity_archiveURL($subscriber_stat['id'], $subscriber_stat['title'], 'serendipityHTTPPath'); ?>"><?php echo $subscriber_stat['title']; ?></a></strong></dt> - <dd><?php echo $subscriber_stat['postings']; ?> <?php echo PLUGIN_EVENT_OUT_TOPSUBSCRIBERS2; ?></dd> + <dd><?php echo $subscriber_stat['postings']; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_TOPSUBSCRIBERS2; ?></dd> <?php } } @@ -325,18 +349,18 @@ <hr /> <br /> - <dt><strong><?php echo PLUGIN_EVENT_OUT_TRACKBACKS; ?></strong></dt> - <dd><?php echo $tb_count[0]; ?> <?php echo PLUGIN_EVENT_OUT_TRACKBACKS2; ?></dd> + <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_TRACKBACKS; ?></strong></dt> + <dd><?php echo $tb_count[0]; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_TRACKBACKS2; ?></dd> <br /> - <dt><strong><?php echo PLUGIN_EVENT_OUT_TOPTRACKBACK; ?></strong></dt> + <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_TOPTRACKBACK; ?></strong></dt> <dl> <?php if (is_array($tb_rows)) { foreach($tb_rows AS $tb => $tb_stat) { ?> <dt><strong><a href="<?php echo serendipity_archiveURL($tb_stat['id'], $tb_stat['title'], 'serendipityHTTPPath'); ?>"><?php echo $tb_stat['title']; ?></a></strong></dt> - <dd><?php echo $tb_stat['postings']; ?> <?php echo PLUGIN_EVENT_OUT_TOPTRACKBACK2; ?></dd> + <dd><?php echo $tb_stat['postings']; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_TOPTRACKBACK2; ?></dd> <?php } } @@ -344,14 +368,14 @@ </dl> <br /> - <dt><strong><?php echo PLUGIN_EVENT_OUT_TOPTRACKBACKS3; ?></strong></dt> + <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_TOPTRACKBACKS3; ?></strong></dt> <dl> <?php if (is_array($tbr_rows)) { foreach($tbr_rows AS $tb => $tb_stat) { ?> <dt><strong><a href="mailto:<?php echo $tb_stat['email']; ?>"><?php echo $tb_stat['author']; ?></a> (<a href="<?php echo $tb_stat['url']; ?>">Link</a>)</strong></dt> - <dd><?php echo $tb_stat['postings']; ?> <?php echo PLUGIN_EVENT_OUT_TOPTRACKBACK2; ?></dd> + <dd><?php echo $tb_stat['postings']; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_TOPTRACKBACK2; ?></dd> <?php } } @@ -361,37 +385,37 @@ <hr /> <br /> - <dt><strong><?php echo PLUGIN_EVENT_OUT_COMMENTS_PER_ARTICLE; ?></strong></dt> - <dd><?php echo round($comment_count[0] / $publish_count[0], 2); ?> <?php echo PLUGIN_EVENT_OUT_COMMENTS_PER_ARTICLE;2 ?></dd> + <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_COMMENTS_PER_ARTICLE; ?></strong></dt> + <dd><?php echo round($comment_count[0] / $publish_count[0], 2); ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_COMMENTS_PER_ARTICLE;2 ?></dd> <br /> - <dt><strong><?php echo PLUGIN_EVENT_OUT_TRACKBACKS_PER_ARTICLE; ?></strong></dt> - <dd><?php echo round($tb_count[0] / $publish_count[0], 2); ?> <?php echo PLUGIN_EVENT_OUT_TRACKBACKS_PER_ARTICLE2; ?></dd> + <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_TRACKBACKS_PER_ARTICLE; ?></strong></dt> + <dd><?php echo round($tb_count[0] / $publish_count[0], 2); ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_TRACKBACKS_PER_ARTICLE2; ?></dd> <br /> - <dt><strong><?php echo PLUGIN_EVENT_OUT_ARTICLES_PER_DAY; ?></strong></dt> - <dd><?php echo round($publish_count[0] / ((time() - $first_entry[0]) / (60*60*24)), 2);?> <?php echo PLUGIN_EVENT_OUT_ARTICLES_PER_DAY2; ?></dd> + <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_DAY; ?></strong></dt> + <dd><?php echo round($publish_count[0] / ((time() - $first_entry[0]) / (60*60*24)), 2);?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_DAY2; ?></dd> <br /> - <dt><strong><?php echo PLUGIN_EVENT_OUT_ARTICLES_PER_WEEK; ?></strong></dt> - <dd><?php echo round($publish_count[0] / ((time() - $first_entry[0]) / (60*60*24*7)), 2);?> <?php echo PLUGIN_EVENT_OUT_ARTICLES_PER_WEEK2; ?></dd> + <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_WEEK; ?></strong></dt> + <dd><?php echo round($publish_count[0] / ((time() - $first_entry[0]) / (60*60*24*7)), 2);?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_WEEK2; ?></dd> <br /> - <dt><strong><?php echo PLUGIN_EVENT_OUT_ARTICLES_PER_MONTH; ?></strong></dt> - <dd><?php echo round($publish_count[0] / ((time() - $first_entry[0]) / (60*60*24*7*31)), 2);?> <?php echo PLUGIN_EVENT_OUT_ARTICLES_PER_MONTH2; ?></dd> + <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_MONTH; ?></strong></dt> + <dd><?php echo round($publish_count[0] / ((time() - $first_entry[0]) / (60*60*24*31)), 2);?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_MONTH2; ?></dd> <br /> <hr /> <br /> - <dt><strong><?php echo PLUGIN_EVENT_OUT_CHARS; ?></strong></dt> - <dd><?php echo $length[0]; ?> <?php echo PLUGIN_EVENT_OUT_CHARS2; ?></dd> + <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_CHARS; ?></strong></dt> + <dd><?php echo $length[0]; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_CHARS2; ?></dd> <br /> - <dt><strong><?php echo PLUGIN_EVENT_OUT_CHARS_PER_ARTICLE; ?></strong></dt> - <dd><?php echo round($length[0] / $publish_count[0], 2); ?> <?php echo PLUGIN_EVENT_OUT_CHARS_PER_ARTICLE2; ?></dd> + <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_CHARS_PER_ARTICLE; ?></strong></dt> + <dd><?php echo round($length[0] / $publish_count[0], 2); ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_CHARS_PER_ARTICLE2; ?></dd> <br /> - <dt><strong><?php printf(PLUGIN_EVENT_OUT_LONGEST_ARTICLES, 5); ?></strong></dt> + <dt><strong><?php printf(PLUGIN_EVENT_STATISTICS_OUT_LONGEST_ARTICLES, 5); ?></strong></dt> <br /> <dl> <?php @@ -399,7 +423,7 @@ foreach($length_rows AS $tb => $length_stat) { ?> <dt><strong><a href="<?php echo serendipity_archiveURL($length_stat['id'], $length_stat['title'], 'serendipityHTTPPath'); ?>"><?php echo $length_stat['title']; ?></a></strong></dt> - <dd><?php echo $length_stat['full_length']; ?> <?php echo PLUGIN_EVENT_OUT_CHARS2; ?></dd> + <dd><?php echo $length_stat['full_length']; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_CHARS2; ?></dd> <?php } } |
|
From: Garvin H. <gar...@us...> - 2004-03-29 08:03:29
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22278 Modified Files: serendipity_functions.inc.php Log Message: IMPORTANT SECURITY FIX, PLEASE TEST! When you installed more than one s9y on the same VirtualHost, any user logged in into one s9y installation could access ALL s9y installations on the same host. This is because session-variables are set per-host, and the session is valid for all installations in subdirectories (does not apply to multiple virtual hosts of course). What we do now is check the username and password of the user's session each time he makes admin actions. If the username is invalid for a different s9y installation, the session will be destroyed. If you have the same username+password combo in multiple blogs, that will still log you in into ALL blogs. In that case, that should be desired behaviour. Index: serendipity_functions.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v retrieving revision 1.242 retrieving revision 1.243 diff -u -d -r1.242 -r1.243 --- serendipity_functions.inc.php 27 Mar 2004 18:28:53 -0000 1.242 +++ serendipity_functions.inc.php 29 Mar 2004 07:52:04 -0000 1.243 @@ -2119,18 +2119,21 @@ echo ' <script type="text/javascript" language="JavaScript" src="serendipity_editor.js"></script>'; } -function serendipity_authenticate_author($username = '', $password = '') { +function serendipity_authenticate_author($username = '', $password = '', $is_md5 = false) { global $serendipity; - if (isset($_SESSION['serendipityUser']) && isset($_SESSION['serendipityEmail']) && isset($_SESSION['serendipityAuthorid']) && isset($_SESSION['serendipityAuthedUser']) && $_SESSION['serendipityAuthedUser'] == true) { - $serendipity['serendipityUser'] = $_SESSION['serendipityUser']; - $serendipity['serendipityEmail'] = $_SESSION['serendipityEmail']; - $serendipity['authorid'] = $_SESSION['serendipityAuthorid']; - return true; + if (isset($_SESSION['serendipityUser']) && isset($_SESSION['serendipityPassword']) && isset($_SESSION['serendipityEmail']) && isset($_SESSION['serendipityAuthorid']) && isset($_SESSION['serendipityAuthedUser']) && $_SESSION['serendipityAuthedUser'] == true) { + $serendipity['serendipityUser'] = $username = $_SESSION['serendipityUser']; + $serendipity['serendipityEmail'] = $_SESSION['serendipityEmail']; + $serendipity['authorid'] = $_SESSION['serendipityAuthorid']; + $serendipity['serendipityPassword'] = $password = $_SESSION['serendipityPassword']; + $is_md5 = true; } if ($username != '') { - $password = md5($password); + if ($is_md5 === false) { + $password = md5($password); + } $query = "SELECT DISTINCT email, authorid @@ -2143,10 +2146,14 @@ if (is_array($row)) { $_SESSION['serendipityUser'] = $serendipity['serendipityUser'] = $username; + $_SESSION['serendipityPassword'] = $serendipity['serendipityPassword'] = $password; $_SESSION['serendipityEmail'] = $serendipity['serendipityEmail'] = $row['email']; $_SESSION['serendipityAuthorid'] = $serendipity['authorid'] = $row['authorid']; $_SESSION['serendipityAuthedUser'] = $serendipity['serendipityAuthedUser'] = true; return true; + } else { + $_SESSION['serendipityAuthedUser'] = false; + session_destroy(); } } |
|
From: Garvin H. <gar...@us...> - 2004-03-29 07:29:37
|
Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_statistics In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17298 Modified Files: serendipity_event_statistics.php Log Message: fixed wrong constant name Index: serendipity_event_statistics.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_statistics/serendipity_event_statistics.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- serendipity_event_statistics.php 26 Mar 2004 16:54:03 -0000 1.2 +++ serendipity_event_statistics.php 29 Mar 2004 07:18:12 -0000 1.3 @@ -351,7 +351,7 @@ foreach($tbr_rows AS $tb => $tb_stat) { ?> <dt><strong><a href="mailto:<?php echo $tb_stat['email']; ?>"><?php echo $tb_stat['author']; ?></a> (<a href="<?php echo $tb_stat['url']; ?>">Link</a>)</strong></dt> - <dd><?php echo $tb_stat['postings']; ?> <?php echo PLUGIN_EVENT_OUT_TRACKBACK2; ?></dd> + <dd><?php echo $tb_stat['postings']; ?> <?php echo PLUGIN_EVENT_OUT_TOPTRACKBACK2; ?></dd> <?php } } |
|
From: Tom S. <tom...@us...> - 2004-03-27 18:46:46
|
Update of /cvsroot/php-blog/serendipity/lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17077/lang Modified Files: serendipity_lang_da.inc.php Log Message: Remove translate tag Index: serendipity_lang_da.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- serendipity_lang_da.inc.php 27 Mar 2004 18:30:15 -0000 1.17 +++ serendipity_lang_da.inc.php 27 Mar 2004 18:35:36 -0000 1.18 @@ -349,7 +349,7 @@ @define('SERENDIPITY_UPGRADER_YOU_HAVE_IGNORED', 'Du har ignoreret en del af opgraderingen. Undersøg venligst om databasen er korrekt opdateret, og planlagte opgaver udført'); @define('SERENDIPITY_UPGRADER_NOW_UPGRADED', 'Din Serendipity-installation er nu opgraderet til version %s'); @define('SERENDIPITY_UPGRADER_RETURN_HERE', 'Du kan vende tilbage til din blog ved at klikke %shere%s'); -@define('IMAGE_NAME', 'Gem dette billeder under følgende navn (efterlad tom hvis du ønsker at beholde det orignale navn): '); // TRANSLATE +@define('IMAGE_NAME', 'Gem dette billeder under følgende navn (efterlad tom hvis du ønsker at beholde det orignale navn): '); /* vim: set sts=4 ts=4 expandtab : */ ?> |
|
From: Tom S. <tom...@us...> - 2004-03-27 18:41:24
|
Update of /cvsroot/php-blog/serendipity/lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15726/lang Modified Files: serendipity_lang_da.inc.php Log Message: Translate update Index: serendipity_lang_da.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- serendipity_lang_da.inc.php 22 Mar 2004 15:19:25 -0000 1.16 +++ serendipity_lang_da.inc.php 27 Mar 2004 18:30:15 -0000 1.17 @@ -349,7 +349,7 @@ @define('SERENDIPITY_UPGRADER_YOU_HAVE_IGNORED', 'Du har ignoreret en del af opgraderingen. Undersøg venligst om databasen er korrekt opdateret, og planlagte opgaver udført'); @define('SERENDIPITY_UPGRADER_NOW_UPGRADED', 'Din Serendipity-installation er nu opgraderet til version %s'); @define('SERENDIPITY_UPGRADER_RETURN_HERE', 'Du kan vende tilbage til din blog ved at klikke %shere%s'); -@define('IMAGE_NAME', 'Save the image using filename (empty: use original file name): '); // TRANSLATE +@define('IMAGE_NAME', 'Gem dette billeder under følgende navn (efterlad tom hvis du ønsker at beholde det orignale navn): '); // TRANSLATE /* vim: set sts=4 ts=4 expandtab : */ ?> |
|
From: Tom S. <tom...@us...> - 2004-03-27 18:40:02
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15339 Modified Files: serendipity_functions.inc.php Log Message: Add new format function for archieve URLs, thanks to zem Index: serendipity_functions.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v retrieving revision 1.241 retrieving revision 1.242 diff -u -d -r1.241 -r1.242 --- serendipity_functions.inc.php 26 Mar 2004 13:21:55 -0000 1.241 +++ serendipity_functions.inc.php 27 Mar 2004 18:28:53 -0000 1.242 @@ -391,7 +391,7 @@ } $monthName = ucfirst(strftime("%B", mktime(0,0,0,$month))); // Prepare the table - $link = $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_ARCHIVES . '/' . $year . sprintf('%02d', $month) . '.html' . $base_query; + $link = serendipity_archiveDateUrl($year . sprintf('%02d', $month)) . $base_query; ?> <table width="100%" class="serendipity_calendar" cellspacing="1"> <tr> @@ -468,7 +468,7 @@ } // Print day - $link = $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_ARCHIVES . '/' . date('Ymd', mktime(0,0,0, $month, $currDay, $year)) . '.html' . $base_query; + $link = serendipity_archiveDateUrl(date('Ymd', mktime(0,0,0, $month, $currDay, $year))) . $base_query; if (date('m') == $month && date('Y') == $year @@ -1771,6 +1771,15 @@ } /** + * return URL for a date archive + */ +function serendipity_archiveDateUrl($range, $short=false, $key='baseURL') { + global $serendipity; + + return $serendipity[$key]. ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_ARCHIVES . '/' . $range . ($short ? '_short' : '') . '.html'; +} + +/** * search through link body, and automatically send a trackback ping. */ function serendipity_handle_references($id, $author, $title, $text) @@ -2436,10 +2445,10 @@ for($x=1; $x<13; $x++) { $entries = serendipity_postAmount($currYear, $x); if ($entries > 0) { - $a = "<a href='{$serendipity['serendipityHTTPPath']}" . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_ARCHIVES."/$currYear" . sprintf('%02s', $x) . '.html\'>'; + $a = "<a href='". serendipity_archiveDateUrl($currYear . sprintf('%02s', $x)) . '\'>'; $b = '</a>'; - $c = "<a href='{$serendipity['serendipityHTTPPath']}" . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_ARCHIVES."/$currYear" . sprintf('%02s', $x) . '_short.html\'>'; - $d = "<a href='{$serendipity['serendipityHTTPPath']}" . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_ARCHIVES."/$currYear" . sprintf('%02s', $x) . '.html\'>'; + $c = "<a href='". serendipity_archiveDateUrl($currYear . sprintf('%02s', $x), true) . '\'>'; + $d = "<a href='". serendipity_archiveDateUrl($currYear . sprintf('%02s', $x)) . '\'>'; } else { $a = $c = '<span style="color: #CDCDCD">'; $b = $d = '</span>'; |
|
From: Garvin H. <gar...@us...> - 2004-03-27 12:22:07
|
Update of /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_comments In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9563/serendipity_plugin_comments Modified Files: serendipity_plugin_comments.php Log Message: Removed plugins setting the locale. This is done in serendipity_config.inc.php depending on the included language and the 'recommended way'. :-) Index: serendipity_plugin_comments.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_comments/serendipity_plugin_comments.php,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- serendipity_plugin_comments.php 26 Feb 2004 11:45:25 -0000 1.15 +++ serendipity_plugin_comments.php 27 Mar 2004 12:10:23 -0000 1.16 @@ -9,6 +9,7 @@ @define('PLUGIN_COMMENTS_MAXCHARS_BLAHBLAH', 'Wieviele Zeichen sollen pro Kommentar gezeigt werden? (Standard: 120)'); @define('PLUGIN_COMMENTS_MAXENTRIES', 'Anzahl an Kommentaren'); @define('PLUGIN_COMMENTS_MAXENTRIES_BLAHBLAH', 'Wieviele Kommentare sollen gezeigt werden? (Standard: 15)'); + @define('PLUGIN_COMMENTS_ABOUT', '%s zu%s'); break; case 'en': @@ -21,7 +22,7 @@ @define('PLUGIN_COMMENTS_MAXCHARS_BLAHBLAH', 'How many chars will be displayed for each comment? (Default: 120)'); @define('PLUGIN_COMMENTS_MAXENTRIES', 'Maximum number of comments'); @define('PLUGIN_COMMENTS_MAXENTRIES_BLAHBLAH', 'How many comments will be shown? (Default: 15)'); - + @define('PLUGIN_COMMENTS_ABOUT', '%s about%s'); break; } @@ -38,7 +39,6 @@ 'wordwrap', 'max_chars', 'max_entries', - 'language', 'dateformat')); } @@ -63,12 +63,6 @@ $propbag->add('description', PLUGIN_COMMENTS_MAXENTRIES_BLAHBLAH); break; - case 'language': - $propbag->add('type', 'string'); - $propbag->add('name', GENERAL_PLUGIN_LANGUAGE); - $propbag->add('description', GENERAL_PLUGIN_LANGUAGE_BLAHBLAH); - break; - case 'dateformat': $propbag->add('type', 'string'); $propbag->add('name', GENERAL_PLUGIN_DATEFORMAT); @@ -85,7 +79,6 @@ { global $serendipity; $title = COMMENTS; - $lang = strtolower($this->get_config('language')); $max_entries = $this->get_config('max_entries'); $max_chars = $this->get_config('max_chars'); $wordwrap = $this->get_config('wordwrap'); @@ -107,24 +100,6 @@ $dateformat = '%a, %d.%m.%Y %H:%M'; } - if ($lang != 'de' && $lang != 'en') { - $lang = 'en'; - } - - switch($lang) { - case 'de': - $loc = setlocale(LC_ALL, 'de_DE'); - if (!$loc) $loc = setlocale(LC_ALL, 'de'); - $out = '%s zu%s'; - break; - - case 'en': - $loc = setlocale(LC_ALL, 'en_US'); - if (!$loc) $loc = setlocale(LC_ALL, 'en'); - $out = '%s about%s'; - break; - } - $q = 'SELECT c.body AS comment, c.timestamp AS stamp, c.author AS user, @@ -164,7 +139,7 @@ serendipity_plugin_api::hook_event('frontend_display', $entry); printf( - $out, + PLUGIN_COMMENTS_ABOUT, $user, ' <a class="highlight" href="' . serendipity_archiveURL($row['entry_id'], $row['subject']) .'#c' . $row['comment_id'] . '" title="' . htmlentities($row['subject']) . '">' |
|
From: Garvin H. <gar...@us...> - 2004-03-27 12:22:05
|
Update of /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_recententries In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9563/serendipity_plugin_recententries Modified Files: serendipity_plugin_recententries.php Log Message: Removed plugins setting the locale. This is done in serendipity_config.inc.php depending on the included language and the 'recommended way'. :-) Index: serendipity_plugin_recententries.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_recententries/serendipity_plugin_recententries.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- serendipity_plugin_recententries.php 9 Feb 2004 15:14:39 -0000 1.2 +++ serendipity_plugin_recententries.php 27 Mar 2004 12:10:23 -0000 1.3 @@ -26,7 +26,7 @@ function introspect(&$propbag) { $propbag->add('name', PLUGIN_RECENTENTRIES_TITLE); $propbag->add('description', PLUGIN_RECENTENTRIES_BLAHBLAH); - $propbag->add('configuration', array('number', 'language', 'dateformat')); + $propbag->add('configuration', array('number', 'dateformat')); } function introspect_config_item($name, &$propbag) { @@ -37,12 +37,6 @@ $propbag->add('description', PLUGIN_RECENTENTRIES_NUMBER_BLAHBLAH); break; - case 'language': - $propbag->add('type', 'string'); - $propbag->add('name', GENERAL_PLUGIN_LANGUAGE); - $propbag->add('description', GENERAL_PLUGIN_LANGUAGE_BLAHBLAH); - break; - case 'dateformat': $propbag->add('type', 'string'); $propbag->add('name', GENERAL_PLUGIN_DATEFORMAT); @@ -59,7 +53,6 @@ global $serendipity; $number = $this->get_config('number'); - $lang = strtolower($this->get_config('language')); $dateformat = $this->get_config('dateformat'); if (!$number || !is_numeric($number) || $number < 1) { @@ -70,24 +63,8 @@ $dateformat = '%A, %B %e %Y'; } - if ($lang != 'de' && $lang != 'en') { - $lang = 'en'; - } - - switch($lang) { - case 'de': - $loc = setlocale(LC_ALL, 'de_DE'); - if (!$loc) $loc = setlocale(LC_ALL, 'de'); - break; - - case 'en': - $loc = setlocale(LC_ALL, 'en_US'); - if (!$loc) $loc = setlocale(LC_ALL, 'en'); - break; - } - $title = PLUGIN_RECENTENTRIES_TITLE; - + $entries = serendipity_db_query("SELECT id, title, timestamp |
|
From: Garvin H. <gar...@us...> - 2004-03-27 12:22:04
|
Update of /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_shoutbox In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9563/serendipity_plugin_shoutbox Modified Files: serendipity_plugin_shoutbox.php Log Message: Removed plugins setting the locale. This is done in serendipity_config.inc.php depending on the included language and the 'recommended way'. :-) Index: serendipity_plugin_shoutbox.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_shoutbox/serendipity_plugin_shoutbox.php,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- serendipity_plugin_shoutbox.php 21 Mar 2004 09:59:47 -0000 1.4 +++ serendipity_plugin_shoutbox.php 27 Mar 2004 12:10:41 -0000 1.5 @@ -29,7 +29,6 @@ @define('PLUGIN_SHOUTBOX_MAXCHARS_BLAHBLAH', 'How many chars will be displayed for each comment? (Default: 120)'); @define('PLUGIN_SHOUTBOX_MAXENTRIES', 'Maximum number of comments'); @define('PLUGIN_SHOUTBOX_MAXENTRIES_BLAHBLAH', 'How many comments will be shown? (Default: 15)'); - break; } @@ -46,7 +45,6 @@ 'wordwrap', 'max_chars', 'max_entries', - 'language', 'dateformat')); } @@ -71,12 +69,6 @@ $propbag->add('description', PLUGIN_SHOUTBOX_MAXENTRIES_BLAHBLAH); break; - case 'language': - $propbag->add('type', 'string'); - $propbag->add('name', GENERAL_PLUGIN_LANGUAGE); - $propbag->add('description', GENERAL_PLUGIN_LANGUAGE_BLAHBLAH); - break; - case 'dateformat': $propbag->add('type', 'string'); $propbag->add('name', GENERAL_PLUGIN_DATEFORMAT); @@ -94,7 +86,6 @@ global $serendipity; $title = PLUGIN_SHOUTBOX_NAME; - $lang = strtolower($this->get_config('language')); $max_entries = $this->get_config('max_entries'); $max_chars = $this->get_config('max_chars'); $wordwrap = $this->get_config('wordwrap'); @@ -157,24 +148,6 @@ if (!$dateformat || strlen($dateformat) < 1) { $dateformat = '%a, %d.%m.%Y %H:%M'; } - - if ($lang != 'de' && $lang != 'en') { - $lang = 'en'; - } - - switch($lang) { - case 'de': - $loc = setlocale(LC_ALL, 'de_DE'); - if (!$loc) $loc = setlocale(LC_ALL, 'de'); - $out = '%s zu%s'; - break; - - case 'en': - $loc = setlocale(LC_ALL, 'en_US'); - if (!$loc) $loc = setlocale(LC_ALL, 'en'); - $out = '%s about%s'; - break; - } ?> <form action="<?php echo $_SERVER['REQUEST_URI']; ?>" method="post"> <div> |
|
From: Garvin H. <gar...@us...> - 2004-03-26 17:05:02
|
Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_statistics In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5272 Modified Files: serendipity_event_statistics.php Log Message: Upps, one of my other modifications for future CVS slipped through :-) [which is, BTW, already working great :-)] Index: serendipity_event_statistics.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_statistics/serendipity_event_statistics.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- serendipity_event_statistics.php 26 Mar 2004 16:47:22 -0000 1.1 +++ serendipity_event_statistics.php 26 Mar 2004 16:54:03 -0000 1.2 @@ -134,11 +134,11 @@ if (isset($hooks[$event])) { switch($event) { case 'backend_sidebar_entries': - if ($serendipity['serendipityUserlevel'] >= USERLEVEL_EDITOR) { + // if ($serendipity['serendipityUserlevel'] >= USERLEVEL_EDITOR) { ?> • <a href="?serendipity[adminModule]=event_display&serendipity[adminAction]=statistics"><?php echo PLUGIN_EVENT_STATISTICS_NAME; ?></a><br /> <?php - } + // } break; |
|
From: Garvin H. <gar...@us...> - 2004-03-26 16:58:32
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3877 Modified Files: serendipity_entries.php NEWS Log Message: Added a statistics panel. NOT TESTED ON POSTGRESQL. I bet it won't work without some tweaks. This integration is mostly a "proof of concept" to show how event plugins can be used to output specific contents by being embeded inside the s9y admin panel. Index: NEWS =================================================================== RCS file: /cvsroot/php-blog/serendipity/NEWS,v retrieving revision 1.98 retrieving revision 1.99 diff -u -d -r1.98 -r1.99 --- NEWS 26 Mar 2004 16:44:18 -0000 1.98 +++ NEWS 26 Mar 2004 16:47:22 -0000 1.99 @@ -3,6 +3,9 @@ Version 0.6 () ------------------------------------------------------------------------ + * Added plugin 'serendipity_event_statistics'. Hooks into the + admin entry-panel. (garvinhicking) + * Do some "common XHTML-mistakes" fixing for output of RSS feeds (jalcorn) Index: serendipity_entries.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_entries.php,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- serendipity_entries.php 24 Mar 2004 12:45:23 -0000 1.26 +++ serendipity_entries.php 26 Mar 2004 16:47:22 -0000 1.27 @@ -59,6 +59,7 @@ • <a href="?serendipity[adminModule]=entries&serendipity[adminAction]=new"><?php echo NEW_ENTRY; ?></a><br /> • <a href="?serendipity[adminModule]=entries&serendipity[adminAction]=editSelect"><?php echo EDIT_ENTRIES; ?></a><br /> • <a href="?serendipity[adminModule]=entries&serendipity[adminAction]=deleteSelect"><?php echo DELETE_ENTRIES; ?></a><br /> + <?php serendipity_plugin_api::hook_event('backend_sidebar_entries', $serendipity); ?> </div> </div> @@ -77,6 +78,7 @@ • <a href="?serendipity[adminModule]=images&serendipity[adminAction]=sync" onclick="return confirm('<?php echo WARNING_THIS_BLAHBLAH; ?>');"><?php echo CREATE_THUMBS; ?></a><br /> </div> </div> + <div class="serendipitySideBarItem"> <div class="serendipitySideBarContent"> • <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity_admin.php"><?php echo ADMIN_INTERFACE; ?></a><br /> @@ -109,7 +111,11 @@ case 'logout': echo LOGGEDOUT; - break; + break; + + case 'event_display': + serendipity_plugin_api::hook_event('backend_sidebar_entries_event_display_' . $serendipity['GET']['adminAction'], $serendipity); + break; default: include S9Y_INCLUDE_PATH . 'serendipity_entries_overview.inc.php'; |
|
From: Garvin H. <gar...@us...> - 2004-03-26 16:58:21
|
Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_statistics In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3877/plugins/serendipity_event_statistics Added Files: serendipity_event_statistics.php Log Message: Added a statistics panel. NOT TESTED ON POSTGRESQL. I bet it won't work without some tweaks. This integration is mostly a "proof of concept" to show how event plugins can be used to output specific contents by being embeded inside the s9y admin panel. --- NEW FILE: serendipity_event_statistics.php --- <?php # $Id: serendipity_event_statistics.php,v 1.1 2004/03/26 16:47:22 garvinhicking Exp $ switch ($serendipity['lang']) { case 'de': @define('PLUGIN_EVENT_STATISTICS_NAME', 'Statistiken'); @define('PLUGIN_EVENT_STATISTICS_DESC', 'Zeigt einen Link zu Statistiken in der Autorenoberfläche'); @define('PLUGIN_EVENT_OUT_STATISTICS', 'Statistik'); @define('PLUGIN_EVENT_OUT_FIRST_ENTRY', 'Erster Eintrag'); @define('PLUGIN_EVENT_OUT_LAST_ENTRY', 'Letzter Eintrag'); @define('PLUGIN_EVENT_OUT_TOTAL_ENTRIES', 'Insgesamt verfasste Artikel'); @define('PLUGIN_EVENT_OUT_ENTRIES', 'Artikel'); @define('PLUGIN_EVENT_OUT_TOTAL_PUBLIC', ' ... davon öffentlich'); @define('PLUGIN_EVENT_OUT_TOTAL_DRAFTS', ' ... davon Entwürfe'); @define('PLUGIN_EVENT_OUT_CATEGORIES', 'Vorhandene Kategorien'); @define('PLUGIN_EVENT_OUT_CATEGORIES2', 'Kategorie(n)'); @define('PLUGIN_EVENT_OUT_DISTRIBUTION_CATEGORIES', 'Verteilung der Artikel auf Kategorien'); @define('PLUGIN_EVENT_OUT_DISTRIBUTION_CATEGORIES2', 'eingetragene(r) Artikel'); @define('PLUGIN_EVENT_OUT_UPLOADED_IMAGES', 'Hochgeladene Bilder'); @define('PLUGIN_EVENT_OUT_UPLOADED_IMAGES2', 'Bild(er)'); @define('PLUGIN_EVENT_OUT_DISTRIBUTION_IMAGES', 'Verteilung der Bild-Dateitypen'); @define('PLUGIN_EVENT_OUT_DISTRIBUTION_IMAGES2', 'vorhandene Datei(en)'); @define('PLUGIN_EVENT_OUT_COMMENTS', 'Erhaltene Kommentare'); @define('PLUGIN_EVENT_OUT_COMMENTS2', 'Kommentar(e)'); @define('PLUGIN_EVENT_OUT_COMMENTS3', 'Top kommentierte Artikel'); @define('PLUGIN_EVENT_OUT_TOPCOMMENTS', 'Top Kommentatoren'); @define('PLUGIN_EVENT_OUT_LINK', 'Link'); @define('PLUGIN_EVENT_OUT_SUBSCRIBERS', 'Abonnenten'); @define('PLUGIN_EVENT_OUT_SUBSCRIBERS2', 'Abonnent(en)'); @define('PLUGIN_EVENT_OUT_TOPSUBSCRIBERS', 'Top abonnierte Artikel'); @define('PLUGIN_EVENT_OUT_TOPSUBSCRIBERS2', 'eingetragene(r) Abonnent(en)'); @define('PLUGIN_EVENT_OUT_TRACKBACKS', 'Erhaltene Trackbacks'); @define('PLUGIN_EVENT_OUT_TRACKBACKS2', 'Trackback(s)'); @define('PLUGIN_EVENT_OUT_TOPTRACKBACK', 'Top Trackback-Artikel'); @define('PLUGIN_EVENT_OUT_TOPTRACKBACK2', 'eingetragene(r) Trackback(s)'); @define('PLUGIN_EVENT_OUT_TOPTRACKBACKS3', 'Top Trackbacker'); @define('PLUGIN_EVENT_OUT_COMMENTS_PER_ARTICLE', 'Durchschnittliche Kommentare pro Artikel'); @define('PLUGIN_EVENT_OUT_TRACKBACKS_PER_ARTICLE', 'Durchschnittliche Trackbacks pro Artikel'); @define('PLUGIN_EVENT_OUT_ARTICLES_PER_DAY', 'Durchschnittliche Artikel pro Tag'); @define('PLUGIN_EVENT_OUT_ARTICLES_PER_WEEK', 'Durchschnittliche Artikel pro Woche'); @define('PLUGIN_EVENT_OUT_ARTICLES_PER_MONTH', 'Durchschnittliche Artikel pro Monat'); @define('PLUGIN_EVENT_OUT_COMMENTS_PER_ARTICLE2', 'Kommentare/Artikel'); @define('PLUGIN_EVENT_OUT_TRACKBACKS_PER_ARTICLE2', 'Trackbacks/Artikel'); @define('PLUGIN_EVENT_OUT_ARTICLES_PER_DAY2', 'Artikel/Tag'); @define('PLUGIN_EVENT_OUT_ARTICLES_PER_WEEK2', 'Artikel/Woche'); @define('PLUGIN_EVENT_OUT_ARTICLES_PER_MONTH2', 'Artikel/Monat'); @define('PLUGIN_EVENT_OUT_CHARS', 'Menge der verfassten Zeichen'); @define('PLUGIN_EVENT_OUT_CHARS2', 'Zeichen'); @define('PLUGIN_EVENT_OUT_CHARS_PER_ARTICLE', 'Zeichen pro Artikel'); @define('PLUGIN_EVENT_OUT_CHARS_PER_ARTICLE2', 'Zeichen/Artikel'); @define('PLUGIN_EVENT_OUT_LONGEST_ARTICLES', 'Die %s längsten Artikel'); break; case 'en': case 'es': default: @define('PLUGIN_EVENT_STATISTICS_NAME', 'Statistics'); @define('PLUGIN_EVENT_STATISTICS_DESC', 'Display a link to statistics in entries-panel'); @define('PLUGIN_EVENT_OUT_STATISTICS', 'Statistics'); @define('PLUGIN_EVENT_OUT_FIRST_ENTRY', 'First entry'); @define('PLUGIN_EVENT_OUT_LAST_ENTRY', 'Last entry'); @define('PLUGIN_EVENT_OUT_TOTAL_ENTRIES', 'Total entries'); @define('PLUGIN_EVENT_OUT_ENTRIES', 'entries'); @define('PLUGIN_EVENT_OUT_TOTAL_PUBLIC', ' ... public'); @define('PLUGIN_EVENT_OUT_TOTAL_DRAFTS', ' ... drafts'); @define('PLUGIN_EVENT_OUT_CATEGORIES', 'Categories'); @define('PLUGIN_EVENT_OUT_CATEGORIES2', 'categories'); @define('PLUGIN_EVENT_OUT_DISTRIBUTION_CATEGORIES', 'Distribution of entries'); @define('PLUGIN_EVENT_OUT_DISTRIBUTION_CATEGORIES2', 'entry'); @define('PLUGIN_EVENT_OUT_UPLOADED_IMAGES', 'Uploaded images'); @define('PLUGIN_EVENT_OUT_UPLOADED_IMAGES2', 'image(s)'); @define('PLUGIN_EVENT_OUT_DISTRIBUTION_IMAGES', 'Distribution of image types'); @define('PLUGIN_EVENT_OUT_DISTRIBUTION_IMAGES2', 'file(s)'); @define('PLUGIN_EVENT_OUT_COMMENTS', 'Received comments'); @define('PLUGIN_EVENT_OUT_COMMENTS2', 'comment(s)'); @define('PLUGIN_EVENT_OUT_COMMENTS3', 'Most frequently commented entries'); @define('PLUGIN_EVENT_OUT_TOPCOMMENTS', 'Most frequently commenting people'); @define('PLUGIN_EVENT_OUT_LINK', 'link'); @define('PLUGIN_EVENT_OUT_SUBSCRIBERS', 'Subscribers'); @define('PLUGIN_EVENT_OUT_SUBSCRIBERS2', 'subscriber(s)'); @define('PLUGIN_EVENT_OUT_TOPSUBSCRIBERS', 'Most frequently subscribed entries'); @define('PLUGIN_EVENT_OUT_TOPSUBSCRIBERS2', 'subscriber(s)'); @define('PLUGIN_EVENT_OUT_TRACKBACKS', 'Received trackbacks'); @define('PLUGIN_EVENT_OUT_TRACKBACKS2', 'trackback(s)'); @define('PLUGIN_EVENT_OUT_TOPTRACKBACK', 'Most frequently trackbacked entires'); @define('PLUGIN_EVENT_OUT_TOPTRACKBACK2', 'trackback(s)'); @define('PLUGIN_EVENT_OUT_TOPTRACKBACKS3', 'Most frequently trackbacking people'); @define('PLUGIN_EVENT_OUT_COMMENTS_PER_ARTICLE', 'estimated comments per entry'); @define('PLUGIN_EVENT_OUT_TRACKBACKS_PER_ARTICLE', 'estimated trackbacks per entry'); @define('PLUGIN_EVENT_OUT_ARTICLES_PER_DAY', 'estimated entries per day'); @define('PLUGIN_EVENT_OUT_ARTICLES_PER_WEEK', 'estimated entries per week'); @define('PLUGIN_EVENT_OUT_ARTICLES_PER_MONTH', 'estimated entries per month'); @define('PLUGIN_EVENT_OUT_COMMENTS_PER_ARTICLE2', 'comments/entries'); @define('PLUGIN_EVENT_OUT_TRACKBACKS_PER_ARTICLE2', 'trackbacks/entry'); @define('PLUGIN_EVENT_OUT_ARTICLES_PER_DAY2', 'entries/day'); @define('PLUGIN_EVENT_OUT_ARTICLES_PER_WEEK2', 'entries/week'); @define('PLUGIN_EVENT_OUT_ARTICLES_PER_MONTH2', 'entries/month'); @define('PLUGIN_EVENT_OUT_CHARS', 'Total amount of characters'); @define('PLUGIN_EVENT_OUT_CHARS2', 'characters'); @define('PLUGIN_EVENT_OUT_CHARS_PER_ARTICLE', 'Characters per entry'); @define('PLUGIN_EVENT_OUT_CHARS_PER_ARTICLE2', 'chars/entry'); @define('PLUGIN_EVENT_OUT_LONGEST_ARTICLES', 'The %s longest entries'); break; } class serendipity_event_statistics extends serendipity_event { function introspect(&$propbag) { global $serendipity; $propbag->add('name', PLUGIN_EVENT_STATISTICS_NAME); $propbag->add('description', PLUGIN_EVENT_STATISTICS_DESC); $propbag->add('event_hooks', array( 'backend_sidebar_entries' => true, 'backend_sidebar_entries_event_display_statistics' => true )); } function introspect_config_item($name, &$propbag) { return true; } function generate_content(&$title) { $title = PLUGIN_EVENT_STATISTICS_NAME; } function event_hook($event, &$bag, &$eventData) { global $serendipity; $hooks = &$bag->get('event_hooks'); if (isset($hooks[$event])) { switch($event) { case 'backend_sidebar_entries': if ($serendipity['serendipityUserlevel'] >= USERLEVEL_EDITOR) { ?> • <a href="?serendipity[adminModule]=event_display&serendipity[adminAction]=statistics"><?php echo PLUGIN_EVENT_STATISTICS_NAME; ?></a><br /> <?php } break; case 'backend_sidebar_entries_event_display_statistics': $first_entry = serendipity_db_query("SELECT timestamp FROM {$serendipity['dbPrefix']}entries ORDER BY timestamp ASC limit 1", true); $last_entry = serendipity_db_query("SELECT timestamp FROM {$serendipity['dbPrefix']}entries ORDER BY timestamp DESC limit 1", true); $total_count = serendipity_db_query("SELECT count(id) FROM {$serendipity['dbPrefix']}entries", true); $draft_count = serendipity_db_query("SELECT count(id) FROM {$serendipity['dbPrefix']}entries WHERE isdraft = 'true'", true); $publish_count = serendipity_db_query("SELECT count(id) FROM {$serendipity['dbPrefix']}entries WHERE isdraft = 'false'", true); $category_count = serendipity_db_query("SELECT count(categoryid) FROM {$serendipity['dbPrefix']}category", true); $category_rows = serendipity_db_query("SELECT c.category_name, count(e.id) as postings FROM {$serendipity['dbPrefix']}category c, {$serendipity['dbPrefix']}entries e WHERE e.categoryid = c.categoryid GROUP BY e.categoryid ORDER BY postings DESC"); $image_count = serendipity_db_query("SELECT count(id) FROM {$serendipity['dbPrefix']}images", true); $image_rows = serendipity_db_query("SELECT extension, count(id) AS images FROM {$serendipity['dbPrefix']}images GROUP BY extension ORDER BY images DESC"); $subscriber_count = count(serendipity_db_query("SELECT count(id) FROM {$serendipity['dbPrefix']}comments WHERE type = 'NORMAL' AND subscribed = 'true' GROUP BY email")); $subscriber_rows = serendipity_db_query("SELECT e.id, e.title, count(c.id) as postings FROM {$serendipity['dbPrefix']}comments c, {$serendipity['dbPrefix']}entries e WHERE e.id = c.entry_id AND type = 'NORMAL' AND subscribed = 'true' GROUP BY e.id, c.email ORDER BY postings DESC"); $comment_count = serendipity_db_query("SELECT count(id) FROM {$serendipity['dbPrefix']}comments WHERE type = 'NORMAL'", true); $comment_rows = serendipity_db_query("SELECT e.id, e.title, count(c.id) as postings FROM {$serendipity['dbPrefix']}comments c, {$serendipity['dbPrefix']}entries e WHERE e.id = c.entry_id AND type = 'NORMAL' GROUP BY e.id ORDER BY postings DESC"); $commentor_rows = serendipity_db_query("SELECT author, email, url, count(id) as postings FROM {$serendipity['dbPrefix']}comments c WHERE type = 'NORMAL' GROUP BY author ORDER BY postings DESC"); $tb_count = serendipity_db_query("SELECT count(id) FROM {$serendipity['dbPrefix']}comments WHERE type = 'TRACKBACK'", true); $tb_rows = serendipity_db_query("SELECT e.id, e.title, count(c.id) as postings FROM {$serendipity['dbPrefix']}comments c, {$serendipity['dbPrefix']}entries e WHERE e.id = c.entry_id AND type = 'TRACKBACK' GROUP BY e.id ORDER BY postings DESC"); $tbr_rows = serendipity_db_query("SELECT author, email, url, count(id) as postings FROM {$serendipity['dbPrefix']}comments c WHERE type = 'TRACKBACK' GROUP BY author ORDER BY postings DESC"); $length = serendipity_db_query("SELECT SUM(LENGTH(body) + LENGTH(extended)) FROM {$serendipity['dbPrefix']}entries", true); $length_rows = serendipity_db_query("SELECT id, title, (LENGTH(body) + LENGTH(extended)) as full_length FROM {$serendipity['dbPrefix']}entries ORDER BY full_length DESC LIMIT 5"); ?> <h3><?php echo PLUGIN_EVENT_OUT_STATISTICS; ?></h3> <div style="margin: 5px; padding: 5px"> <dl> <dt><strong><?php echo PLUGIN_EVENT_OUT_FIRST_ENTRY; ?></strong></dt> <dd><?php echo ucfirst(strftime(DATE_FORMAT_ENTRY . ' %H:%m', $first_entry[0])); ?></dd> <br /> <dt><strong><?php echo PLUGIN_EVENT_OUT_LAST_ENTRY; ?></strong></dt> <dd><?php echo ucfirst(strftime(DATE_FORMAT_ENTRY . ' %H:%m', $last_entry[0])); ?></dd> <br /> <hr /> <br /> <dt><strong><?php echo PLUGIN_EVENT_OUT_TOTAL_ENTRIES; ?></strong></dt> <dd><?php echo $total_count[0]; ?> <?php echo PLUGIN_EVENT_OUT_ENTRIES; ?></dd> <br /> <dl> <dt><strong><?php echo PLUGIN_EVENT_OUT_TOTAL_PUBLIC; ?></strong></dt> <dd><?php echo $publish_count[0]; ?> <?php echo PLUGIN_EVENT_OUT_ENTRIES; ?></dd> <dt><strong><?php echo PLUGIN_EVENT_OUT_TOTAL_DRAFTS; ?></strong></dt> <dd><?php echo $draft_count[0]; ?> <?php echo PLUGIN_EVENT_OUT_ENTRIES; ?></dd> </dl> <br /> <hr /> <br /> <dt><strong><?php echo PLUGIN_EVENT_OUT_CATEGORIES; ?></strong></dt> <dd><?php echo $category_count[0]; ?> <?php echo PLUGIN_EVENT_OUT_CATEGORIES2; ?></dd> <br /> <dt><strong><?php echo PLUGIN_EVENT_OUT_DISTRIBUTION_CATEGORIES; ?></strong></dt> <dl> <?php if (is_array($category_rows)) { foreach($category_rows AS $category => $cat_stat) { ?> <dt><strong><?php echo $cat_stat['category_name']; ?></strong></dt> <dd><?php echo $cat_stat['postings']; ?> <?php echo PLUGIN_EVENT_OUT_DISTRIBUTION_CATEGORIES2; ?></dd> <?php } } ?> </dl> <br /> <hr /> <br /> <dt><strong><?php echo PLUGIN_EVENT_OUT_UPLOADED_IMAGES; ?></strong></dt> <dd><?php echo $image_count[0]; ?> <?php echo PLUGIN_EVENT_OUT_UPLOADED_IMAGES2; ?></dd> <br /> <dt><strong><?php echo PLUGIN_EVENT_OUT_DISTRIBUTION_IMAGES; ?></strong></dt> <dl> <?php if (is_array($image_rows)) { foreach($image_rows AS $image => $image_stat) { ?> <dt><strong><?php echo $image_stat['extension']; ?></strong></dt> <dd><?php echo $image_stat['images']; ?> <?php echo PLUGIN_EVENT_OUT_DISTRIBUTION_IMAGES2; ?></dd> <?php } } ?> </dl> <br /> <hr /> <br /> <dt><strong><?php echo PLUGIN_EVENT_OUT_COMMENTS; ?></strong></dt> <dd><?php echo $comment_count[0]; ?> <?php echo PLUGIN_EVENT_OUT_COMMENTS2; ?></dd> <br /> <dt><strong><?php echo PLUGIN_EVENT_OUT_COMMENTS3; ?></strong></dt> <dl> <?php if (is_array($comment_rows)) { foreach($comment_rows AS $comment => $com_stat) { ?> <dt><strong><a href="<?php echo serendipity_archiveURL($com_stat['id'], $com_stat['title'], 'serendipityHTTPPath'); ?>"><?php echo $com_stat['title']; ?></a></strong></dt> <dd><?php echo $com_stat['postings']; ?> <?php echo PLUGIN_EVENT_OUT_COMMENTS2; ?></dd> <?php } } ?> </dl> <br /> <dt><strong><?php echo PLUGIN_EVENT_OUT_TOPCOMMENTS; ?></strong></dt> <dl> <?php if (is_array($commentor_rows)) { foreach($commentor_rows AS $comment => $com_stat) { ?> <dt><strong><a href="mailto:<?php echo $com_stat['email']; ?>"><?php echo $com_stat['author']; ?></a> (<a href="<?php echo $com_stat['url']; ?>"><?php echo PLUGIN_EVENT_OUT_LINK; ?></a>)</strong></dt> <dd><?php echo $com_stat['postings']; ?> <?php echo PLUGIN_EVENT_OUT_COMMENTS2; ?></dd> <?php } } ?> </dl> <br /> <hr /> <br /> <dt><strong><?php echo PLUGIN_EVENT_OUT_SUBSCRIBERS; ?></strong></dt> <dd><?php echo $subscriber_count; ?> <?php echo PLUGIN_EVENT_OUT_SUBSCRIBERS2; ?></dd> <br /> <dt><strong><?php echo PLUGIN_EVENT_OUT_TOPSUBSCRIBERS; ?></strong></dt> <dl> <?php if (is_array($subscriber_rows)) { foreach($subscriber_rows AS $subscriber => $subscriber_stat) { ?> <dt><strong><a href="<?php echo serendipity_archiveURL($subscriber_stat['id'], $subscriber_stat['title'], 'serendipityHTTPPath'); ?>"><?php echo $subscriber_stat['title']; ?></a></strong></dt> <dd><?php echo $subscriber_stat['postings']; ?> <?php echo PLUGIN_EVENT_OUT_TOPSUBSCRIBERS2; ?></dd> <?php } } ?> </dl> <br /> <hr /> <br /> <dt><strong><?php echo PLUGIN_EVENT_OUT_TRACKBACKS; ?></strong></dt> <dd><?php echo $tb_count[0]; ?> <?php echo PLUGIN_EVENT_OUT_TRACKBACKS2; ?></dd> <br /> <dt><strong><?php echo PLUGIN_EVENT_OUT_TOPTRACKBACK; ?></strong></dt> <dl> <?php if (is_array($tb_rows)) { foreach($tb_rows AS $tb => $tb_stat) { ?> <dt><strong><a href="<?php echo serendipity_archiveURL($tb_stat['id'], $tb_stat['title'], 'serendipityHTTPPath'); ?>"><?php echo $tb_stat['title']; ?></a></strong></dt> <dd><?php echo $tb_stat['postings']; ?> <?php echo PLUGIN_EVENT_OUT_TOPTRACKBACK2; ?></dd> <?php } } ?> </dl> <br /> <dt><strong><?php echo PLUGIN_EVENT_OUT_TOPTRACKBACKS3; ?></strong></dt> <dl> <?php if (is_array($tbr_rows)) { foreach($tbr_rows AS $tb => $tb_stat) { ?> <dt><strong><a href="mailto:<?php echo $tb_stat['email']; ?>"><?php echo $tb_stat['author']; ?></a> (<a href="<?php echo $tb_stat['url']; ?>">Link</a>)</strong></dt> <dd><?php echo $tb_stat['postings']; ?> <?php echo PLUGIN_EVENT_OUT_TRACKBACK2; ?></dd> <?php } } ?> </dl> <br /> <hr /> <br /> <dt><strong><?php echo PLUGIN_EVENT_OUT_COMMENTS_PER_ARTICLE; ?></strong></dt> <dd><?php echo round($comment_count[0] / $publish_count[0], 2); ?> <?php echo PLUGIN_EVENT_OUT_COMMENTS_PER_ARTICLE;2 ?></dd> <br /> <dt><strong><?php echo PLUGIN_EVENT_OUT_TRACKBACKS_PER_ARTICLE; ?></strong></dt> <dd><?php echo round($tb_count[0] / $publish_count[0], 2); ?> <?php echo PLUGIN_EVENT_OUT_TRACKBACKS_PER_ARTICLE2; ?></dd> <br /> <dt><strong><?php echo PLUGIN_EVENT_OUT_ARTICLES_PER_DAY; ?></strong></dt> <dd><?php echo round($publish_count[0] / ((time() - $first_entry[0]) / (60*60*24)), 2);?> <?php echo PLUGIN_EVENT_OUT_ARTICLES_PER_DAY2; ?></dd> <br /> <dt><strong><?php echo PLUGIN_EVENT_OUT_ARTICLES_PER_WEEK; ?></strong></dt> <dd><?php echo round($publish_count[0] / ((time() - $first_entry[0]) / (60*60*24*7)), 2);?> <?php echo PLUGIN_EVENT_OUT_ARTICLES_PER_WEEK2; ?></dd> <br /> <dt><strong><?php echo PLUGIN_EVENT_OUT_ARTICLES_PER_MONTH; ?></strong></dt> <dd><?php echo round($publish_count[0] / ((time() - $first_entry[0]) / (60*60*24*7*31)), 2);?> <?php echo PLUGIN_EVENT_OUT_ARTICLES_PER_MONTH2; ?></dd> <br /> <hr /> <br /> <dt><strong><?php echo PLUGIN_EVENT_OUT_CHARS; ?></strong></dt> <dd><?php echo $length[0]; ?> <?php echo PLUGIN_EVENT_OUT_CHARS2; ?></dd> <br /> <dt><strong><?php echo PLUGIN_EVENT_OUT_CHARS_PER_ARTICLE; ?></strong></dt> <dd><?php echo round($length[0] / $publish_count[0], 2); ?> <?php echo PLUGIN_EVENT_OUT_CHARS_PER_ARTICLE2; ?></dd> <br /> <dt><strong><?php printf(PLUGIN_EVENT_OUT_LONGEST_ARTICLES, 5); ?></strong></dt> <br /> <dl> <?php if (is_array($length_rows)) { foreach($length_rows AS $tb => $length_stat) { ?> <dt><strong><a href="<?php echo serendipity_archiveURL($length_stat['id'], $length_stat['title'], 'serendipityHTTPPath'); ?>"><?php echo $length_stat['title']; ?></a></strong></dt> <dd><?php echo $length_stat['full_length']; ?> <?php echo PLUGIN_EVENT_OUT_CHARS2; ?></dd> <?php } } ?> </dl> </dl> </div> <?php return true; break; default: return false; break; } } else { return false; } } } /* vim: set sts=4 ts=4 expandtab : */ ?> |
|
From: Garvin H. <gar...@us...> - 2004-03-26 16:55:16
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3509 Modified Files: NEWS Log Message: forget to commit Index: NEWS =================================================================== RCS file: /cvsroot/php-blog/serendipity/NEWS,v retrieving revision 1.97 retrieving revision 1.98 diff -u -d -r1.97 -r1.98 --- NEWS 25 Mar 2004 10:50:45 -0000 1.97 +++ NEWS 26 Mar 2004 16:44:18 -0000 1.98 @@ -3,6 +3,9 @@ Version 0.6 () ------------------------------------------------------------------------ + * Do some "common XHTML-mistakes" fixing for output of RSS feeds + (jalcorn) + * Updated WYSIWYG-Editor (htmlarea) to latest version. Integrated s9y image manager in htmlarea window. Template file 'htmlarea.css' can be used to adjust the editor's look to your template. |
|
From: Garvin H. <gar...@us...> - 2004-03-26 16:53:37
|
Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_statistics In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3107/serendipity_event_statistics Log Message: Directory /cvsroot/php-blog/serendipity/plugins/serendipity_event_statistics added to the repository |
|
From: Garvin H. <gar...@us...> - 2004-03-26 14:36:54
|
Update of /cvsroot/php-blog/serendipity/lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6477 Modified Files: serendipity_lang_de.inc.php Log Message: more reasonable german translation Index: serendipity_lang_de.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- serendipity_lang_de.inc.php 22 Mar 2004 15:19:25 -0000 1.27 +++ serendipity_lang_de.inc.php 26 Mar 2004 14:25:55 -0000 1.28 @@ -116,7 +116,7 @@ @define('DATE_FORMAT_1', 'd.m.Y'); @define('CALENDAR', 'Kalender'); @define('QUICKJUMP_CALENDAR', 'QuickJump Kalender'); -@define('QUICKSEARCH', 'Schnellsuche'); +@define('QUICKSEARCH', 'Suche'); @define('SEARCH_FOR_ENTRY', 'Nach Einträgen suchen'); @define('ARCHIVES', 'Archive'); @define('BROWSE_ARCHIVES', 'Die Archive durchstöbern'); @@ -126,7 +126,7 @@ @define('SHOWS_TOP_EXIT', 'Zeigt die Top-Exit-Links Ihres Blogs'); @define('SYNDICATION', 'Syndication'); @define('SHOWS_RSS_BLAHBLAH', 'Zeigt die RSS Syndication-Links'); -@define('SUPERUSER', 'Eigentümer'); +@define('SUPERUSER', 'Login'); @define('ALLOWS_YOU_BLAHBLAH', 'Link zum Konfigurieren von Serendipity und zum Schreiben von Einträgen - WICHTIG'); @define('PLUG', 'Plug'); @define('ADVERTISES_BLAHBLAH', 'Zeigt einen Hinweis, dass Serendipity die Blog Software ist'); @@ -134,8 +134,8 @@ @define('HOLDS_A_BLAHBLAH', 'Zeigt einen kleinen Klotz HTML Code in einer der Seitenleisten an'); @define('TITLE_FOR_NUGGET', 'Titel für den Klotz'); @define('THE_NUGGET', 'Der HTML Klotz!'); -@define('SYNDICATE_THIS_BLOG', 'Syndicate This Blog'); -@define('QUICKJUMP', 'Schnellauswahl'); +@define('SYNDICATE_THIS_BLOG', 'Blog abonnieren'); +@define('QUICKJUMP', 'Kalender'); @define('SEARCH_TOO_SHORT', 'Bitte geben Sie einen Suchbegriff mit mindestens drei Zeichen an.'); @define('YOU_CHOSE', 'Sie haben sich für %s entschieden'); @define('IMAGE_SIZE', 'Bildgröße'); |
|
From: Garvin H. <gar...@us...> - 2004-03-26 13:32:57
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24084 Modified Files: serendipity_functions.inc.php Log Message: make arrays static, remove <p>-Handling, add hr-handling Index: serendipity_functions.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v retrieving revision 1.240 retrieving revision 1.241 diff -u -d -r1.240 -r1.241 --- serendipity_functions.inc.php 25 Mar 2004 22:13:16 -0000 1.240 +++ serendipity_functions.inc.php 26 Mar 2004 13:21:55 -0000 1.241 @@ -1360,19 +1360,19 @@ // TODO: // check ALL ampersands, find out if it's a valid code, and encode if not function xhtml_cleanup($html) { - $p = array("/\&([\s\<])/", // ampersand followed by whitespace or tag - "/\&$/", // ampersand at end of body - "/<br([^\/]*)>/i", // unclosed br tag - attributes included - "/<p([^\/]*)>/i", // any unclosed p tag - "/<\/p>/i" // closing </p> tags, dropped for feed + static $p = array( + '/\&([\s\<])/', // ampersand followed by whitespace or tag + '/\&$/', // ampersand at end of body + '/<(b|h)r([^\/>]*)>/i', // unclosed br tag - attributes included ); - $r = array("&\\1", - "&", - "<br\\1 />", - "<p\\1 />", - "" + + static $r = array( + '&\1', + '&', + '<\1r\2 />' ); - return preg_replace($p,$r,$html); + + return preg_replace($p, $r, $html); } function serendipity_printEntries_rss($entries, $version, $comments = false) { |
|
From: Justin A. <jba...@us...> - 2004-03-25 22:24:17
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19120 Modified Files: serendipity_functions.inc.php Log Message: function to clean up blog entries as best we can to make valid ATOM feeds. xhtml_cleanup should be watched carefully and tested on as many feeds as possible. Index: serendipity_functions.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v retrieving revision 1.239 retrieving revision 1.240 diff -u -d -r1.239 -r1.240 --- serendipity_functions.inc.php 25 Mar 2004 10:57:38 -0000 1.239 +++ serendipity_functions.inc.php 25 Mar 2004 22:13:16 -0000 1.240 @@ -1351,6 +1351,30 @@ return $guid; } +// jbalcorn: starter function to clean up xhtml for atom feed. Add things to this as we find common +// mistakes, unless someone finds a better way to do this. +// DONE: +// since someone encoded all the urls, we can now assume any amp followed by +// whitespace or a HTML tag (i.e. &<br /> )should be +// encoded and most not with a space are intentional +// TODO: +// check ALL ampersands, find out if it's a valid code, and encode if not +function xhtml_cleanup($html) { + $p = array("/\&([\s\<])/", // ampersand followed by whitespace or tag + "/\&$/", // ampersand at end of body + "/<br([^\/]*)>/i", // unclosed br tag - attributes included + "/<p([^\/]*)>/i", // any unclosed p tag + "/<\/p>/i" // closing </p> tags, dropped for feed + ); + $r = array("&\\1", + "&", + "<br\\1 />", + "<p\\1 />", + "" + ); + return preg_replace($p,$r,$html); +} + function serendipity_printEntries_rss($entries, $version, $comments = false) { global $serendipity; @@ -1373,6 +1397,8 @@ // Do some relative -> absolute URI replacing magic. Replaces all HREF/SRC (<a>, <img>, ...) references to only the serendipitypath with the full baseURL URI // garvin: Could impose some problems. Closely watch this one. $entry['body'] = preg_replace('@(href|src)=("|\')(' . preg_quote($serendipity['serendipityHTTPPath']) . ')(.*)("|\')(.*)>@imsU', '\1=\2' . $serendipity['baseURL'] . '\4\2\6>', $entry['body']); + // jbalcorn: clean up body for XML compliance as best we can. + $entry['body'] = xhtml_cleanup($entry['body']); serendipity_plugin_api::hook_event('frontend_display', $entry); // extract author information |
