CVS update: /cowiki/, /cowiki/includes/cowiki/plugin/

User: ytjohn  
Date: 2005/08/25 23:20:04

Modified:
   cowiki/ChangeLog
   cowiki/includes/cowiki/plugin/class.CustomRssViewer.php

Log:
 Issue number:
 Obtained from: 
 Submitted by:  
 Reviewed by:   
 

File Changes:

Directory: /cowiki/
===================

File [changed]: ChangeLog
Url: http://cowiki.tigris.org/source/browse/cowiki/ChangeLog?r1=1.114&r2=1.115
Delta lines:  +3 -1
-------------------
--- ChangeLog	11 Aug 2005 04:13:59 -0000	1.114
+++ ChangeLog	26 Aug 2005 06:19:59 -0000	1.115
@@ -1,11 +1,13 @@
 #
 # coWiki change log
 #
-# $Id: ChangeLog,v 1.114 2005/08/11 04:13:59 dgorski Exp $
+# $Id: ChangeLog,v 1.115 2005/08/26 06:19:59 ytjohn Exp $
 #
 
 Version 0.4.0 (Fullerene)                                    YET UNRELEASED
 ---------------------------------------------------------------------------
+* 2005-08-25 - Fix issue #240: Allow user to enter encoding for RssViewer
+               plugin as a parameter (ytjohn)
 * 2005-08-10 - Fix bug: allow query part in an URI while fetching remote
                content in HttpRequest (dtg) 
 * 2005-08-03 - Fixed issue #94: Login names are extended to 16 characters

Directory: /cowiki/includes/cowiki/plugin/
==========================================

File [changed]: class.CustomRssViewer.php
Url: http://cowiki.tigris.org/source/browse/cowiki/includes/cowiki/plugin/class.CustomRssViewer.php?r1=1.7&r2=1.8
Delta lines:  +10 -5
--------------------
--- class.CustomRssViewer.php	16 Jan 2005 23:32:09 -0000	1.7
+++ class.CustomRssViewer.php	26 Aug 2005 06:19:59 -0000	1.8
@@ -2,7 +2,7 @@
 
 /**
  *
- * $Id: class.CustomRssViewer.php,v 1.7 2005/01/16 23:32:09 dgorski Exp $
+ * $Id: class.CustomRssViewer.php,v 1.8 2005/08/26 06:19:59 ytjohn Exp $
  *
  * This file is part of coWiki. coWiki is free software under the terms of
  * the GNU General Public License (GPL). Read the LICENSE file. If you did
@@ -19,6 +19,8 @@
  * #param:     expires  Time in seconds for the internal cache to expire.
  *                      Feed will be fetched again after this time period.
  *                      (default: 3600 - which is one hour)
+ * #param:     encode Encoding used for feed
+                        (default: iso-8859-1)
  * #caching:   yes, internal cache for the template
  * #version:   1.0
  * #date:      18. October 2003
@@ -35,7 +37,7 @@
  * @author      Kai Schröder, <[email protected]>
  * @copyright   (C) Kai Schröder {@link http://kai.cowiki.org}
  * @license     http://www.gnu.org/licenses/gpl.html
- * @version     $Revision: 1.7 $
+ * @version     $Revision: 1.8 $
  *
  */
 
@@ -98,6 +100,9 @@
         $nExpire = $this->Context->getPluginParam('expires')
                     ? (int)abs($this->Context->getPluginParam('expires'))
                     : 3600;
+        $sEncode = $this->Context->getPluginParam('encode')
+	            ? $this->Context->getPluginParam('encode')
+		    : 'iso-8859-1';
 
         // ---
 
@@ -159,8 +164,8 @@
             }
             $aTplItem[] = array(
                 'HREF'   => $Item->get('link'),
-                'NAME'   => htmlentities($Item->get('title')),
-                'TEASER' => htmlentities($Item->get('description')),
+                'NAME'   => htmlentities($Item->get('title'),ENT_COMPAT,$sEncode),
+                'TEASER' => htmlentities($Item->get('description'),ENT_COMPAT,$sEncode),
                 'DATE'   => $Item->getRelativeDate()
             );
             $aDates[] = $Item->getRelativeDate();