R33222 - in /trunk/news_admin/website: ./ templates/

Old eGW-svn
1

Author: ralfbecker
New Revision: 33222

URL: http://www.egroupware.org/viewvc/egroupware?rev=33222&view=rev
Log:

  • got html in rss export working again
    using CDATA instead of htmlspecialchars

Modified:
trunk/news_admin/website/export.php
trunk/news_admin/website/templates/rdf.tpl
trunk/news_admin/website/templates/rdf_row.tpl
trunk/news_admin/website/templates/rss091.tpl
trunk/news_admin/website/templates/rss1.tpl
trunk/news_admin/website/templates/rss2.tpl

Modified: trunk/news_admin/website/export.php
URL: http://www.egroupware.org/viewvc/egroupware/trunk/news_admin/website/export.php?rev=33222&r1=33221&r2=33222&view=diff

— trunk/news_admin/website/export.php (original)
+++ trunk/news_admin/website/export.php Tue Nov 30 20:26:31 2010
@@ -78,15 +78,15 @@
$formats[$feedConf[‘type’]] ? $formats[$feedConf[‘type’]] : (
‘rss2’ ));

  • $feedConf[‘title’] = htmlspecialchars($feedConf[‘title’] ? $feedConf[‘title’] : (
  • $feedConf[‘title’] = $feedConf[‘title’] ? $feedConf[‘title’] : (
    $sitemgr_info[‘site_name’] ? $sitemgr_info[‘site_name’] : (
    $GLOBALS[‘egw_info’][‘server’][‘site_title’] ? $GLOBALS[‘egw_info’][‘server’][‘site_title’] :
  •   lang('News'))));

  •   lang('News')));
  • $feedConf[‘link’] = htmlspecialchars($feedConf[‘link’] ? $feedConf[‘link’] :
  • $feedConf[‘link’] = $feedConf[‘link’] ? $feedConf[‘link’] :
    ( $GLOBALS[‘sitemgr_info’][‘site_url’] ? ( stripos($GLOBALS[‘sitemgr_info’][‘site_url’],‘http’) !== false ? $GLOBALS[‘sitemgr_info’][‘site_url’] : (
    ( stripos($_SERVER[‘SERVER_PROTOCOL’],‘https’) !== false ? ‘https’ : ‘http’). ‘://’. $_SERVER[‘HTTP_HOST’]. $GLOBALS[‘sitemgr_info’][‘site_url’] )) :
  •   '' /* add link to news_admin here... maybe we could add an item support in export.php? */ ));

  •   '' /* add link to news_admin here... maybe we could add an item support in export.php? */ );

    if ( !$feedConf[‘description’] ) {
    if ( $cat_id > 0 ) {
    @@ -114,10 +114,10 @@

    if(is_array($news)) {
    foreach($news as $news_data) {

  •   	$tpl->set_var('content',htmlspecialchars($news_data['news_content']));

  •   	$tpl->set_var('subject',htmlspecialchars($news_data['news_headline']));

  •   	$tpl->set_var('teaser',htmlspecialchars($format == 'rss2' && $news_data['news_content'] ? '<p><b>'.$news_data['news_teaser']."</b></p>\n" :

  •   		$news_data['news_content']));

  •   	$tpl->set_var('content',$news_data['news_content']);

  •   	$tpl->set_var('subject',$news_data['news_headline']);

  •   	$tpl->set_var('teaser',$format == 'rss2' && $news_data['news_content'] ? '<p><b>'.$news_data['news_teaser']."</b></p>\n" :

  •   		$news_data['news_content']);

  	$tpl->set_var('item_link',htmlspecialchars($news_data['link'] ? $news_data['link'] : $feedConf['link'] . $itemsyntax . $news_data['news_id']));
  	$tpl->set_var('pub_date', date("r",$news_data['news_date']));

Modified: trunk/news_admin/website/templates/rdf.tpl
URL: http://www.egroupware.org/viewvc/egroupware/trunk/news_admin/website/templates/rdf.tpl?rev=33222&r1=33221&r2=33222&view=diff

— trunk/news_admin/website/templates/rdf.tpl (original)
+++ trunk/news_admin/website/templates/rdf.tpl Tue Nov 30 20:26:31 2010
@@ -1,15 +1,15 @@

<?xml version="1.0" encoding="{encoding}"?>

-<rdf:RDF
+<rdf:RDF
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns=“http://my.netscape.com/rdf/simple/0.9/”>

  •            <title>{site_title}</title>

  •            <title><![CDATA[{site_title}]]></title>
           <link>{site_link}</link>

  •            <description>{site_description}</description>

  •            <description><![CDATA[{site_description}]]></description>
   </channel>

   <image>

  •            <title>{img_title}</title>

  •            <title><![CDATA[{img_title}]]></title>
           <url>{img_url}</url>
           <link>{img_link}</link>
   </image>

Modified: trunk/news_admin/website/templates/rdf_row.tpl
URL: http://www.egroupware.org/viewvc/egroupware/trunk/news_admin/website/templates/rdf_row.tpl?rev=33222&r1=33221&r2=33222&view=diff

— trunk/news_admin/website/templates/rdf_row.tpl (original)
+++ trunk/news_admin/website/templates/rdf_row.tpl Tue Nov 30 20:26:31 2010
@@ -1,4 +1,4 @@

  •            <title>{title}</title>

  •            <link>{link}</link>

  •            <title><![CDATA[{title}]]></title>

  •            <link><![CDATA[{link}]]></link>
   </item>

Modified: trunk/news_admin/website/templates/rss091.tpl
URL: http://www.egroupware.org/viewvc/egroupware/trunk/news_admin/website/templates/rss091.tpl?rev=33222&r1=33221&r2=33222&view=diff

— trunk/news_admin/website/templates/rss091.tpl (original)
+++ trunk/news_admin/website/templates/rss091.tpl Tue Nov 30 20:26:31 2010
@@ -1,19 +1,19 @@

<?xml version="1.0" encoding="{encoding}"?> - {title} + {link} - {description} + - {image_title} - {image_url} - {image_link} + + {image_url} + {image_link} - {subject} + {item_link} - {teaser} +

Modified: trunk/news_admin/website/templates/rss1.tpl
URL: http://www.egroupware.org/viewvc/egroupware/trunk/news_admin/website/templates/rss1.tpl?rev=33222&r1=33221&r2=33222&view=diff

— trunk/news_admin/website/templates/rss1.tpl (original)
+++ trunk/news_admin/website/templates/rss1.tpl Tue Nov 30 20:26:31 2010
@@ -1,12 +1,12 @@

<?xml version="1.0" encoding="{encoding}"?>

<rdf:RDF xmlns:rdf=“http://www.w3.org/1999/02/22-rdf-syntax-ns#”>

  •   <title>{title}</title>

  •   <title><![CDATA[{title}]]></title>
  <link>{link}</link>

  •   <description>{description}</description>

  •   <description><![CDATA[{description}]]></description>

  <image rdf:resource="{img_url}" />

  •   <items>
  	<rdf:Seq>
  		<!-- BEGIN seq -->

@@ -15,17 +15,17 @@
</rdf:Seq>

  •   <title>{img_title}</title>

  •   <title><![CDATA[{img_title}]]></title>
  <link>{img_link}</link>
  <url>{img_url}</url>

<item>

  •   <title>{subject}</title>

  •   <title><![CDATA[{subject}]]></title>
  <link>{item_link}</link>

  •   <description>{teaser}</description>

  •   <description><![CDATA[{teaser}]]></description>

</rdf:RDF>

Modified: trunk/news_admin/website/templates/rss2.tpl
URL: http://www.egroupware.org/viewvc/egroupware/trunk/news_admin/website/templates/rss2.tpl?rev=33222&r1=33221&r2=33222&view=diff

— trunk/news_admin/website/templates/rss2.tpl (original)
+++ trunk/news_admin/website/templates/rss2.tpl Tue Nov 30 20:26:31 2010
@@ -1,12 +1,12 @@

<?xml version="1.0" encoding="{encoding}"?> - {title} + {link} - {description} + - {subject} + {item_link} {pub_date}

Increase Visibility of Your 3D Game App & Earn a Chance To Win $500!
Tap into the largest installed PC base & get more eyes on your game by
optimizing for Intel® Graphics Technology. Get started today with the
Intel® Software Partner Program. Five $500 cash prizes are up for grabs.
http://p.sf.net/sfu/intelisp-dev2dev

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs