Changeset 160

Timestamp:

06/09/08 20:00:25 (7 months ago)

Author:

llaumgui

Message:

Modification dans la gestion des flux RSS. Plus propre

Location:

ez_publish/myutils/trunk

Files:

• design/standard/templates/feed/channel_full.tpl (modified) (1 diff)
• design/standard/templates/node/view/rss.tpl (modified) (1 diff)
• modules/feed/rss.php (modified) (1 diff)
• settings/rss.ini.append.php (modified) (1 diff)

ez_publish/myutils/trunk/design/standard/templates/feed/channel_full.tpl

@@ -1 @@
-{if is_set(ezini( 'Global', 'FeedCache', 'rss.ini')[$node.node_id])}
-{set-block scope=global variable=cache_ttl}{ezini( 'Global', 'FeedCache', 'rss.ini')[$node.node_id]}{/set-block}
+{set-block scope=global variable=cache_ttl}{$cache}{/set-block}
 {def $items = fetch( content, list, hash(       parent_node_id,         $node.node_id,
                                                                                         sort_by,                array( 'published', false() ),
-                                                                                        limit,                  ezini( 'Global', 'FeedLimit', 'rss.ini')[$node.node_id]
+                                                                                        limit,                          $limit
                                                                                 ) )
 }
 
-<title>{ezini( 'Global', 'FeedTitle', 'rss.ini')[$node.node_id]|wash}</title>
-<link>{"/"|ezroot('no', 'full')}</link>
-<description>{ezini( 'Global', 'FeedDescription', 'rss.ini')[$node.node_id]|wash}</description>
+                <title>{$title}</title>
+                <link>{"/"|ezroot('no', 'full')}</link>
+                <description>{$description}</description>
+                {if $image|ne('')}<image>{concat( ""|ezroot('no', 'full'), $image|ezimage('no', 'true') )}</image>{/if}
 {foreach $items as $item}
-                {node_view_gui content_node=$item view=rss}
+        {node_view_gui content_node=$item view=rss}
 {/foreach}
 {undef}
-{/if}

ez_publish/myutils/trunk/design/standard/templates/node/view/rss.tpl

@@ -1 @@
-<item>
-        <pubDate>{$node.object.published||datetime( 'custom', '%D, %d %M %Y %H:%i:%s' )} GMT</pubDate>
-        <title>{$node.name|wash()}</title>
-        <link>{$node.url_alias|ezurl('no','full')}</link>
-        <guid>{$node.url_alias|ezurl('no','full')}</guid>
-        <description>{$node.data_map.description.content|trim()|wash()}</description>
-</item>
+        
+                <item>
+                        <pubDate>{$node.object.published||datetime( 'custom', '%D, %d %M %Y %H:%i:%s' )} GMT</pubDate>
+                        <title>{$node.name|wash()}</title>
+                        <link>{$node.url_alias|ezurl('no','full')}</link>
+                        <guid>{$node.url_alias|ezurl('no','full')}</guid>
+                        <description>{$node.name|trim()|wash()}</description>
+                </item>

ez_publish/myutils/trunk/modules/feed/rss.php

@@ -6 +6 @@
 
 
-$nodeId         = $Params['RssId'];
+$rssId          = $Params['RssId'];
 $tpl            = templateInit();
+$rssini         = eZINI::instance('rss.ini');
+
+/* On récupÚre le flux RSS  */
+if ( !empty( $rssId ) && $rssini->hasSection($rssId) )
+{
+}
+else {
+        $nodeId                         = $rssini->variable( "Global", "FeedNodeID" );  
+        $feedTitle                      = $rssini->variable( "Global", "FeedTitle" );
+        $feedDescription        = $rssini->variable( "Global", "FeedDescription" );
+        $feedImage                      = $rssini->variable( "Global", "FeedImage" );
+        $feedCache                      = $rssini->variable( "Global", "FeedCache" );
+        $feedLimit                      = $rssini->variable( "Global", "FeedLimit" );
+}
 
 $node           = eZContentObjectTreeNode::fetch( $nodeId );
-$tpl->setVariable( 'node', $node );
+$tpl->setVariable( 'node',                      $node );
+$tpl->setVariable( 'title',             $feedTitle );
+$tpl->setVariable( 'description',       $feedDescription );
+$tpl->setVariable( 'image',             $feedImage );
+$tpl->setVariable( 'cache',             $feedCache );
+$tpl->setVariable( 'limit',             $feedLimit );
 
 

ez_publish/myutils/trunk/settings/rss.ini.append.php

@@ -1 +1 @@
 <?php /* #?ini charset="utf-8"?
 
-#[Global]
-#FeedTitle[]
-#FeedTitle[xx]=Planet Fedora-Fr
-
-#FeedDescription[]
-#FeedDescription[xx]=Sélection de blogs autour de Fedora
+[Global]
+FeedNodeID=2
+FeedTitle=Feed title
+FeedDescription=Feed description
+FeedImage=
+FeedCache=3600
+FeedLimit=20
 
 */ ?>