|
From: <gar...@us...> - 2003-08-10 22:23:48
|
Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv22917
Modified Files:
rss.php serendipity_functions.inc.php
serendipity_lang_de.inc.php
Log Message:
* RSS-Feed: Properly sort comments for the feed again. Was showing up
reversed sorting since last commit for the functions file.
* RSS-Feed: utf8_encode the authorname and use htmlspecialchars. Could lead
to unvalidateable feeds when a user put in (german) umlauts
* Renamed german strings for sending notify-mails on comments to use
iso-8859-1.
Index: rss.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/rss.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- rss.php 5 Aug 2003 14:07:40 -0000 1.9
+++ rss.php 10 Aug 2003 22:23:45 -0000 1.10
@@ -12,7 +12,7 @@
$comments = FALSE;
switch ($_GET['type']) {
case 'comments':
- $entries = serendipity_fetchComments(null, 15);
+ $entries = serendipity_fetchComments(null, 15, 'desc');
$title = $title . ' ' . COMMENTS;
$description = COMMENTS_FROM . ' ' . $description;
$comments = TRUE;
@@ -73,7 +73,7 @@
print <<<HEAD
<rss version="2.0/XSS-extensible"
xmlns="http://purl.org/rss/2.0/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:admin="http://webns.net/mvcb/"
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:content="http://purl.org/rss/1.0/modules/content/"
Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- serendipity_functions.inc.php 10 Aug 2003 17:56:10 -0000 1.123
+++ serendipity_functions.inc.php 10 Aug 2003 22:23:45 -0000 1.124
@@ -604,7 +604,7 @@
} // end else short mode
} // end function serendipity_printEntries
-function serendipity_deleteComment($id,$entry_id,$type='comments')
+function serendipity_deleteComment($id, $entry_id, $type='comments')
{
global $serendipity;
@@ -620,7 +620,7 @@
}
}
-function serendipity_fetchComments($id, $limit = null)
+function serendipity_fetchComments($id, $limit = null, $order = '')
{
global $serendipity;
@@ -650,7 +650,7 @@
LEFT JOIN {$serendipity['dbPrefix']}category c ON (e.categoryid = c.categoryid)
WHERE co.type LIKE 'NORMAL' $and
ORDER BY
- co.id
+ co.id " . ($order != '' ? $order : '') . "
$limit";
$comments = serendipity_db_query($query);
@@ -902,7 +902,7 @@
?>
<category><?php echo utf8_encode(htmlspecialchars($entry['category_name'])); ?></category>
<comments><?php echo $guid; ?></comments>
- <author><?php echo htmlentities($entry['email']) . ' (' . htmlentities($entry['username']) . ')'; ?></author>
+ <author><?php echo utf8_encode(htmlspecialchars($entry['email'])) . ' (' . utf8_encode(htmlspecialchars($entry['username'])) . ')'; ?></author>
<content:encoded>
<?php echo utf8_encode(htmlspecialchars(nl2br(serendipity_emoticate(serendipity_markup_text($entry['body']))))); ?>
</content:encoded>
Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_de.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- serendipity_lang_de.inc.php 9 Aug 2003 00:57:49 -0000 1.20
+++ serendipity_lang_de.inc.php 10 Aug 2003 22:23:45 -0000 1.21
@@ -33,8 +33,8 @@
define('SAVE', 'Speichern');
define('NAME', 'Name');
define('SEND_MAIL_TO', 'Mail schicken an');
-define('NEW_TRACKBACK_TO', 'Neues Trackback für');
-define('NEW_COMMENT_TO', 'Neuer Kommentar für');
+define('NEW_TRACKBACK_TO', 'Neues Trackback für');
+define('NEW_COMMENT_TO', 'Neuer Kommentar für');
define('RECENT', 'Das neueste...');
define('OLDER', 'Älteres...');
define('ANONYMOUS', 'Anonym');
|
