From 1749ed7c9115b7ec2796422f1df41a88eb3981c8 Mon Sep 17 00:00:00 2001
From: Julien Chanseaume <julien.chanseaume@gmail.com>
Date: Sat, 3 May 2014 16:48:14 +0200
Subject: [PATCH 1/9] added new route and controller for feeds

---
 local/modules/Front/Config/front.xml          |   9 +
 .../Front/Controller/FeedController.php       | 200 ++++++++++++++++++
 2 files changed, 209 insertions(+)
 create mode 100644 local/modules/Front/Controller/FeedController.php

diff --git a/local/modules/Front/Config/front.xml b/local/modules/Front/Config/front.xml
index 4f32372a3..0a987eaa2 100644
--- a/local/modules/Front/Config/front.xml
+++ b/local/modules/Front/Config/front.xml
@@ -200,6 +200,15 @@
     </route>
     <!-- end sitemap generator -->
 
+    <!-- feed generator -->
+    <route id="feed.process" path="/feed/{context}/{lang}/{id}">
+        <default key="_controller">Front\Controller\FeedController::generateAction</default>
+        <default key="context">catalog</default>
+        <default key="lang"></default>
+        <default key="id"></default>
+    </route>
+    <!-- end feed generator -->
+
     <!-- Default Route -->
     <route id="default" path="/{_view}">
         <default key="_controller">Thelia\Controller\Front\DefaultController::noAction</default>
diff --git a/local/modules/Front/Controller/FeedController.php b/local/modules/Front/Controller/FeedController.php
new file mode 100644
index 000000000..d9e3a5c5c
--- /dev/null
+++ b/local/modules/Front/Controller/FeedController.php
@@ -0,0 +1,200 @@
+<?php
+/*************************************************************************************/
+/*      This file is part of the Thelia package.                                     */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*      email : dev@thelia.net                                                       */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      For the full copyright and license information, please view the LICENSE.txt  */
+/*      file that was distributed with this source code.                             */
+/*************************************************************************************/
+
+
+namespace Front\Controller;
+
+use Doctrine\Common\Cache\FilesystemCache;
+use Thelia\Controller\Front\BaseFrontController;
+use Thelia\Core\HttpFoundation\Request;
+use Thelia\Core\HttpFoundation\Response;
+use Thelia\Log\Tlog;
+use Thelia\Model\Base\FolderQuery;
+use Thelia\Model\CategoryQuery;
+use Thelia\Model\ConfigQuery;
+use Thelia\Model\Folder;
+use Thelia\Model\Lang;
+use Thelia\Model\LangQuery;
+
+/**
+ * Controller uses to generate RSS Feeds
+ *
+ * A default cache of 2 hours is used to avoid attack. You can flush cache if you have `ADMIN` role and pass flush=1 in
+ * query string parameter.
+ *
+ * @package Front\Controller
+ * @author Julien Chanséaume <jchanseaume@openstudio.fr>
+ */
+class FeedController extends BaseFrontController {
+
+
+    /**
+     * Folder name for feeds cache
+     */
+    const FEED_CACHE_DIR = "feeds";
+
+    /**
+     * Key prefix for feed cache
+     */
+    const FEED_CACHE_KEY = "feed";
+
+
+    /**
+     * render the RSS feed
+     *
+     * @param $context string   The context of the feed : catalog, content. default: catalog
+     * @param $lang string      The lang of the feed : fr_FR, en_US, ... default: default language of the site
+     * @param $id string        The id of the parent element. The id of the main parent category for catalog context.
+     *                          The id of the content folder for content context
+     * @return Response
+     */
+    public function generateAction($context, $lang, $id)
+    {
+
+        /** @var Request $request */
+        $request = $this->getRequest();
+
+        // context
+        if ("" === $context){
+            $context = "catalog";
+        } else if (! in_array($context, array("catalog", "content")) ){
+            $this->pageNotFound();
+        }
+
+        // the locale : fr, en,
+        if ("" !== $lang) {
+            if (! $this->checkLang($lang)){
+                $this->pageNotFound();
+            }
+        } else {
+            try{
+                $lang = Lang::getDefaultLanguage();
+                $lang = $lang->getLocale();
+            } catch (\RuntimeException $ex){
+                // @todo generate error page
+                throw new \RuntimeException("No default language is defined. Please define one.");
+            }
+        }
+        if (null === $lang = LangQuery::create()->findOneByLocale($lang)){
+            $this->pageNotFound();
+        }
+        $lang = $lang->getId();
+
+        // check if element exists and is visible
+        if ("" !== $id){
+            if (false === $this->checkId($context, $id)){
+                $this->pageNotFound();
+            }
+        }
+
+        $flush = $request->query->get("flush", "");
+
+        // check if feed already in cache
+        $cacheContent = false;
+
+        $cacheDir = $this->getCacheDir();
+        $cacheKey = self::FEED_CACHE_KEY . $lang . $context . $id;
+        $cacheExpire = intval(ConfigQuery::read("feed_ttl", '7200')) ?: 7200;
+
+        $cacheDriver = new FilesystemCache($cacheDir);
+        if (!($this->checkAdmin() && "" !== $flush)){
+            $cacheContent = $cacheDriver->fetch($cacheKey);
+        } else {
+            $cacheDriver->delete($cacheKey);
+        }
+
+        // if not in cache
+        if (false === $cacheContent){
+            // render the view
+            $cacheContent = $this->renderRaw(
+                "feed",
+                array(
+                    "_context_" => $context,
+                    "_lang_"    => $lang,
+                    "_id_"      => $id
+                )
+            );
+            // save cache
+            $cacheDriver->save($cacheKey, $cacheContent, $cacheExpire);
+        }
+
+        $response = new Response();
+        $response->setContent($cacheContent);
+        $response->headers->set('Content-Type', 'application/rss+xml');
+
+        return $response;
+    }
+
+
+    /**
+     * get the cache directory for feeds
+     *
+     * @return mixed|string
+     */
+    protected function getCacheDir()
+    {
+        $cacheDir = $this->container->getParameter("kernel.cache_dir");
+        $cacheDir = rtrim($cacheDir, '/');
+        $cacheDir .= '/' . self::FEED_CACHE_DIR . '/';
+
+        return $cacheDir;
+    }
+
+    /**
+     * Check if current user has ADMIN role
+     *
+     * @return bool
+     */
+    protected function checkAdmin(){
+        return $this->getSecurityContext()->hasAdminUser();
+    }
+
+
+    /**
+     * Check if a lang is used
+     *
+     * @param $lang The lang code. e.g.: fr
+     * @return bool true if the language is used, otherwise false
+     */
+    private function checkLang($lang)
+    {
+        // load locals
+        $lang = LangQuery::create()
+            ->findOneByLocale($lang);
+
+        return (null !== $lang);
+    }
+
+
+    /**
+     * Ckeck if the element exists and is visible
+     *
+     * @param $context string   catalog or content
+     * @param $id string        id of the element
+     * @return bool
+     */
+    private function checkId($context, $id)
+    {
+        $ret = false;
+        if (is_numeric($id)){
+            if ("catalog" === $context){
+                $cat = CategoryQuery::create()->findPk($id);
+                $ret = (null !== $cat && $cat->getVisible());
+            } else {
+                $folder = FolderQuery::create()->findPk($id);
+                $ret = (null !== $folder && $folder->getVisible());
+            }
+        }
+        return $ret;
+    }
+
+} 
\ No newline at end of file

From d094fd496912cb222ff92a771331767f13e5903a Mon Sep 17 00:00:00 2001
From: Julien Chanseaume <julien.chanseaume@gmail.com>
Date: Sat, 3 May 2014 16:48:42 +0200
Subject: [PATCH 2/9] new template for generating feeds

---
 templates/frontOffice/default/feed.html | 69 +++++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 templates/frontOffice/default/feed.html

diff --git a/templates/frontOffice/default/feed.html b/templates/frontOffice/default/feed.html
new file mode 100644
index 000000000..f24477796
--- /dev/null
+++ b/templates/frontOffice/default/feed.html
@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+<rss version="2.0">
+{* @todo order item by create date desc *}
+{assign var="store_name" value="{config key="store_name"}"}
+{loop type="lang" name="lang" id=$_lang_}
+    {assign var="locale" value="{$LOCALE}"}
+{/loop}
+{if $_context_ == "catalog"}
+    <channel>
+    {if $_id_ == "" }
+        <title>{intl l="Catalog"} | {$store_name}</title>
+        <link>{url path="/"}</link>
+        <description>{$store_name}</description>
+        <language>{$locale|replace:'_':'-'|lower}</language>
+        <lastBuildDate>{$smarty.now|date_format:'r'}</lastBuildDate>
+        <generator>Thelia 2.0</generator>
+    {else}
+        {loop type="category" name="category" id=$_id_ lang=$_lang_ }
+        <title>{$TITLE} | {$store_name}</title>
+        <link>{$URL}</link>
+        <description>{$CHAPO}</description>
+        <language>{$LOCALE|replace:'_':'-'|lower}</language>
+        <pubDate>{format_date date=$UPDATE_DATE format="r"}</pubDate>
+        <lastBuildDate>{$smarty.now|date_format:'r'}</lastBuildDate>
+        <generator>Thelia 2.0</generator>
+        {/loop}
+    {/if}
+    {loop type="product" name="product" category_default=$_id_ lang=$_lang_ order="id_reverse" }
+        <item>
+            <title>{$TITLE}</title>
+            <link>{$URL}</link>
+            <description>{$CHAPO}</description>
+            <pubDate>{format_date date=$CREATE_DATE format="r"}</pubDate>
+            <guid>{$URL}</guid>
+        </item>
+    {/loop}
+    </channel>
+{else}
+    <channel>
+        {if $_id_ == "" }
+        <title>{intl l="Contents"} | {$store_name}</title>
+        <link>{url path="/"}</link>
+        <description>{$store_name}</description>
+        <language>{$locale|replace:'_':'-'|lower}</language>
+        <lastBuildDate>{$smarty.now|date_format:'r'}</lastBuildDate>
+        <generator>Thelia 2.0</generator>
+        {else}
+        {loop type="folder" name="folder" id=$_id_ lang=$_lang_ }
+        <title>{$TITLE} | {$store_name}</title>
+        <link>{$URL}</link>
+        <description>{$CHAPO}</description>
+        <language>{$LOCALE|replace:'_':'-'|lower}</language>
+        <pubDate>{format_date date=$UPDATE_DATE format="r"}</pubDate>
+        <lastBuildDate>{$smarty.now|date_format:'r'}</lastBuildDate>
+        <generator>Thelia 2.0</generator>
+        {/loop}
+        {/if}
+        {loop type="content" name="content" folder_default=$_id_ lang=$_lang_ }
+        <item>
+            <title>{$TITLE}</title>
+            <link>{$URL}</link>
+            <description>{$CHAPO}</description>
+            <pubDate>{format_date date=$CREATE_DATE format="r"}</pubDate>
+            <guid>{$URL}</guid>
+        </item>
+        {/loop}
+    </channel>
+{/if}
+</rss>

From fbc4a87d340cd3e588890ffa15df983beec9f330 Mon Sep 17 00:00:00 2001
From: Julien Chanseaume <julien.chanseaume@gmail.com>
Date: Sat, 3 May 2014 16:49:53 +0200
Subject: [PATCH 3/9] updated default front theme to integrate RSS feeds

---
 templates/frontOffice/default/category.html | 5 +++++
 templates/frontOffice/default/content.html  | 5 +++++
 templates/frontOffice/default/layout.tpl    | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/templates/frontOffice/default/category.html b/templates/frontOffice/default/category.html
index e7fa3116a..6f1b11045 100644
--- a/templates/frontOffice/default/category.html
+++ b/templates/frontOffice/default/category.html
@@ -18,6 +18,11 @@
     {/loop}
 {/block}
 
+{* Feeds *}
+{block name="feeds"}
+    <link rel="alternate" type="application/rss+xml" title="{intl l='All products for'} {category attr='title'}" href="{url path="/feed/catalog/{lang attr="locale"}/{content attr="id"}"}" />
+{/block}
+
 {* Breadcrumb *}
 {block name='no-return-functions' append}
     {$breadcrumbs = []}
diff --git a/templates/frontOffice/default/content.html b/templates/frontOffice/default/content.html
index 59775fa78..d357487ea 100644
--- a/templates/frontOffice/default/content.html
+++ b/templates/frontOffice/default/content.html
@@ -18,6 +18,11 @@
     {/loop}
 {/block}
 
+{* Feeds *}
+{block name="feeds"}
+<link rel="alternate" type="application/rss+xml" title="{intl l='All contents for'} {content attr='title'}" href="{url path="/feed/content/{lang attr="locale"}/{content attr="id"}"}" />
+{/block}
+
 {* Breadcrumb *}
 {block name='no-return-functions' append}
     {$breadcrumbs = []}
diff --git a/templates/frontOffice/default/layout.tpl b/templates/frontOffice/default/layout.tpl
index ab57fe8da..8a2d06a4c 100644
--- a/templates/frontOffice/default/layout.tpl
+++ b/templates/frontOffice/default/layout.tpl
@@ -64,6 +64,11 @@ GNU General Public License : http://www.gnu.org/licenses/
     {images file='assets/img/favicon.ico'}<link rel="shortcut icon" type="image/x-icon" href="{$asset_url}">{/images}
     {images file='assets/img/favicon.png'}<link rel="icon" type="image/png" href="{$asset_url}" />{/images}
 
+    {* Feeds *}
+    <link rel="alternate" type="application/rss+xml" title="{intl l='All products'}" href="{url path="/feed/catalog/{lang attr="locale"}"}" />
+    <link rel="alternate" type="application/rss+xml" title="{intl l='All contents'}" href="{url path="/feed/content/{lang attr="locale"}"}" />
+    {block name="feeds"}{/block}
+
     {* HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries *}
     <!--[if lt IE 9]>
     <script src="//oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>

From 7e70ac8ac87c129646dc6ba53e1a5bfe9f966266 Mon Sep 17 00:00:00 2001
From: Julien Chanseaume <julien.chanseaume@gmail.com>
Date: Sat, 3 May 2014 16:48:14 +0200
Subject: [PATCH 4/9] added new route and controller for feeds

---
 local/modules/Front/Config/front.xml          |   9 +
 .../Front/Controller/FeedController.php       | 200 ++++++++++++++++++
 2 files changed, 209 insertions(+)
 create mode 100644 local/modules/Front/Controller/FeedController.php

diff --git a/local/modules/Front/Config/front.xml b/local/modules/Front/Config/front.xml
index 4f32372a3..0a987eaa2 100644
--- a/local/modules/Front/Config/front.xml
+++ b/local/modules/Front/Config/front.xml
@@ -200,6 +200,15 @@
     </route>
     <!-- end sitemap generator -->
 
+    <!-- feed generator -->
+    <route id="feed.process" path="/feed/{context}/{lang}/{id}">
+        <default key="_controller">Front\Controller\FeedController::generateAction</default>
+        <default key="context">catalog</default>
+        <default key="lang"></default>
+        <default key="id"></default>
+    </route>
+    <!-- end feed generator -->
+
     <!-- Default Route -->
     <route id="default" path="/{_view}">
         <default key="_controller">Thelia\Controller\Front\DefaultController::noAction</default>
diff --git a/local/modules/Front/Controller/FeedController.php b/local/modules/Front/Controller/FeedController.php
new file mode 100644
index 000000000..d9e3a5c5c
--- /dev/null
+++ b/local/modules/Front/Controller/FeedController.php
@@ -0,0 +1,200 @@
+<?php
+/*************************************************************************************/
+/*      This file is part of the Thelia package.                                     */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*      email : dev@thelia.net                                                       */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      For the full copyright and license information, please view the LICENSE.txt  */
+/*      file that was distributed with this source code.                             */
+/*************************************************************************************/
+
+
+namespace Front\Controller;
+
+use Doctrine\Common\Cache\FilesystemCache;
+use Thelia\Controller\Front\BaseFrontController;
+use Thelia\Core\HttpFoundation\Request;
+use Thelia\Core\HttpFoundation\Response;
+use Thelia\Log\Tlog;
+use Thelia\Model\Base\FolderQuery;
+use Thelia\Model\CategoryQuery;
+use Thelia\Model\ConfigQuery;
+use Thelia\Model\Folder;
+use Thelia\Model\Lang;
+use Thelia\Model\LangQuery;
+
+/**
+ * Controller uses to generate RSS Feeds
+ *
+ * A default cache of 2 hours is used to avoid attack. You can flush cache if you have `ADMIN` role and pass flush=1 in
+ * query string parameter.
+ *
+ * @package Front\Controller
+ * @author Julien Chanséaume <jchanseaume@openstudio.fr>
+ */
+class FeedController extends BaseFrontController {
+
+
+    /**
+     * Folder name for feeds cache
+     */
+    const FEED_CACHE_DIR = "feeds";
+
+    /**
+     * Key prefix for feed cache
+     */
+    const FEED_CACHE_KEY = "feed";
+
+
+    /**
+     * render the RSS feed
+     *
+     * @param $context string   The context of the feed : catalog, content. default: catalog
+     * @param $lang string      The lang of the feed : fr_FR, en_US, ... default: default language of the site
+     * @param $id string        The id of the parent element. The id of the main parent category for catalog context.
+     *                          The id of the content folder for content context
+     * @return Response
+     */
+    public function generateAction($context, $lang, $id)
+    {
+
+        /** @var Request $request */
+        $request = $this->getRequest();
+
+        // context
+        if ("" === $context){
+            $context = "catalog";
+        } else if (! in_array($context, array("catalog", "content")) ){
+            $this->pageNotFound();
+        }
+
+        // the locale : fr, en,
+        if ("" !== $lang) {
+            if (! $this->checkLang($lang)){
+                $this->pageNotFound();
+            }
+        } else {
+            try{
+                $lang = Lang::getDefaultLanguage();
+                $lang = $lang->getLocale();
+            } catch (\RuntimeException $ex){
+                // @todo generate error page
+                throw new \RuntimeException("No default language is defined. Please define one.");
+            }
+        }
+        if (null === $lang = LangQuery::create()->findOneByLocale($lang)){
+            $this->pageNotFound();
+        }
+        $lang = $lang->getId();
+
+        // check if element exists and is visible
+        if ("" !== $id){
+            if (false === $this->checkId($context, $id)){
+                $this->pageNotFound();
+            }
+        }
+
+        $flush = $request->query->get("flush", "");
+
+        // check if feed already in cache
+        $cacheContent = false;
+
+        $cacheDir = $this->getCacheDir();
+        $cacheKey = self::FEED_CACHE_KEY . $lang . $context . $id;
+        $cacheExpire = intval(ConfigQuery::read("feed_ttl", '7200')) ?: 7200;
+
+        $cacheDriver = new FilesystemCache($cacheDir);
+        if (!($this->checkAdmin() && "" !== $flush)){
+            $cacheContent = $cacheDriver->fetch($cacheKey);
+        } else {
+            $cacheDriver->delete($cacheKey);
+        }
+
+        // if not in cache
+        if (false === $cacheContent){
+            // render the view
+            $cacheContent = $this->renderRaw(
+                "feed",
+                array(
+                    "_context_" => $context,
+                    "_lang_"    => $lang,
+                    "_id_"      => $id
+                )
+            );
+            // save cache
+            $cacheDriver->save($cacheKey, $cacheContent, $cacheExpire);
+        }
+
+        $response = new Response();
+        $response->setContent($cacheContent);
+        $response->headers->set('Content-Type', 'application/rss+xml');
+
+        return $response;
+    }
+
+
+    /**
+     * get the cache directory for feeds
+     *
+     * @return mixed|string
+     */
+    protected function getCacheDir()
+    {
+        $cacheDir = $this->container->getParameter("kernel.cache_dir");
+        $cacheDir = rtrim($cacheDir, '/');
+        $cacheDir .= '/' . self::FEED_CACHE_DIR . '/';
+
+        return $cacheDir;
+    }
+
+    /**
+     * Check if current user has ADMIN role
+     *
+     * @return bool
+     */
+    protected function checkAdmin(){
+        return $this->getSecurityContext()->hasAdminUser();
+    }
+
+
+    /**
+     * Check if a lang is used
+     *
+     * @param $lang The lang code. e.g.: fr
+     * @return bool true if the language is used, otherwise false
+     */
+    private function checkLang($lang)
+    {
+        // load locals
+        $lang = LangQuery::create()
+            ->findOneByLocale($lang);
+
+        return (null !== $lang);
+    }
+
+
+    /**
+     * Ckeck if the element exists and is visible
+     *
+     * @param $context string   catalog or content
+     * @param $id string        id of the element
+     * @return bool
+     */
+    private function checkId($context, $id)
+    {
+        $ret = false;
+        if (is_numeric($id)){
+            if ("catalog" === $context){
+                $cat = CategoryQuery::create()->findPk($id);
+                $ret = (null !== $cat && $cat->getVisible());
+            } else {
+                $folder = FolderQuery::create()->findPk($id);
+                $ret = (null !== $folder && $folder->getVisible());
+            }
+        }
+        return $ret;
+    }
+
+} 
\ No newline at end of file

From 92a7404a3bbb9420cead2a694c302b662c57ca2b Mon Sep 17 00:00:00 2001
From: Julien Chanseaume <julien.chanseaume@gmail.com>
Date: Sat, 3 May 2014 16:48:42 +0200
Subject: [PATCH 5/9] new template for generating feeds

---
 templates/frontOffice/default/feed.html | 69 +++++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 templates/frontOffice/default/feed.html

diff --git a/templates/frontOffice/default/feed.html b/templates/frontOffice/default/feed.html
new file mode 100644
index 000000000..f24477796
--- /dev/null
+++ b/templates/frontOffice/default/feed.html
@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+<rss version="2.0">
+{* @todo order item by create date desc *}
+{assign var="store_name" value="{config key="store_name"}"}
+{loop type="lang" name="lang" id=$_lang_}
+    {assign var="locale" value="{$LOCALE}"}
+{/loop}
+{if $_context_ == "catalog"}
+    <channel>
+    {if $_id_ == "" }
+        <title>{intl l="Catalog"} | {$store_name}</title>
+        <link>{url path="/"}</link>
+        <description>{$store_name}</description>
+        <language>{$locale|replace:'_':'-'|lower}</language>
+        <lastBuildDate>{$smarty.now|date_format:'r'}</lastBuildDate>
+        <generator>Thelia 2.0</generator>
+    {else}
+        {loop type="category" name="category" id=$_id_ lang=$_lang_ }
+        <title>{$TITLE} | {$store_name}</title>
+        <link>{$URL}</link>
+        <description>{$CHAPO}</description>
+        <language>{$LOCALE|replace:'_':'-'|lower}</language>
+        <pubDate>{format_date date=$UPDATE_DATE format="r"}</pubDate>
+        <lastBuildDate>{$smarty.now|date_format:'r'}</lastBuildDate>
+        <generator>Thelia 2.0</generator>
+        {/loop}
+    {/if}
+    {loop type="product" name="product" category_default=$_id_ lang=$_lang_ order="id_reverse" }
+        <item>
+            <title>{$TITLE}</title>
+            <link>{$URL}</link>
+            <description>{$CHAPO}</description>
+            <pubDate>{format_date date=$CREATE_DATE format="r"}</pubDate>
+            <guid>{$URL}</guid>
+        </item>
+    {/loop}
+    </channel>
+{else}
+    <channel>
+        {if $_id_ == "" }
+        <title>{intl l="Contents"} | {$store_name}</title>
+        <link>{url path="/"}</link>
+        <description>{$store_name}</description>
+        <language>{$locale|replace:'_':'-'|lower}</language>
+        <lastBuildDate>{$smarty.now|date_format:'r'}</lastBuildDate>
+        <generator>Thelia 2.0</generator>
+        {else}
+        {loop type="folder" name="folder" id=$_id_ lang=$_lang_ }
+        <title>{$TITLE} | {$store_name}</title>
+        <link>{$URL}</link>
+        <description>{$CHAPO}</description>
+        <language>{$LOCALE|replace:'_':'-'|lower}</language>
+        <pubDate>{format_date date=$UPDATE_DATE format="r"}</pubDate>
+        <lastBuildDate>{$smarty.now|date_format:'r'}</lastBuildDate>
+        <generator>Thelia 2.0</generator>
+        {/loop}
+        {/if}
+        {loop type="content" name="content" folder_default=$_id_ lang=$_lang_ }
+        <item>
+            <title>{$TITLE}</title>
+            <link>{$URL}</link>
+            <description>{$CHAPO}</description>
+            <pubDate>{format_date date=$CREATE_DATE format="r"}</pubDate>
+            <guid>{$URL}</guid>
+        </item>
+        {/loop}
+    </channel>
+{/if}
+</rss>

From 6e0e6dddd2836fd38457d6270cf8f38cbf56b7e4 Mon Sep 17 00:00:00 2001
From: Julien Chanseaume <julien.chanseaume@gmail.com>
Date: Sat, 3 May 2014 16:49:53 +0200
Subject: [PATCH 6/9] updated default front theme to integrate RSS feeds

---
 templates/frontOffice/default/category.html | 5 +++++
 templates/frontOffice/default/content.html  | 5 +++++
 templates/frontOffice/default/layout.tpl    | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/templates/frontOffice/default/category.html b/templates/frontOffice/default/category.html
index e7fa3116a..6f1b11045 100644
--- a/templates/frontOffice/default/category.html
+++ b/templates/frontOffice/default/category.html
@@ -18,6 +18,11 @@
     {/loop}
 {/block}
 
+{* Feeds *}
+{block name="feeds"}
+    <link rel="alternate" type="application/rss+xml" title="{intl l='All products for'} {category attr='title'}" href="{url path="/feed/catalog/{lang attr="locale"}/{content attr="id"}"}" />
+{/block}
+
 {* Breadcrumb *}
 {block name='no-return-functions' append}
     {$breadcrumbs = []}
diff --git a/templates/frontOffice/default/content.html b/templates/frontOffice/default/content.html
index 59775fa78..d357487ea 100644
--- a/templates/frontOffice/default/content.html
+++ b/templates/frontOffice/default/content.html
@@ -18,6 +18,11 @@
     {/loop}
 {/block}
 
+{* Feeds *}
+{block name="feeds"}
+<link rel="alternate" type="application/rss+xml" title="{intl l='All contents for'} {content attr='title'}" href="{url path="/feed/content/{lang attr="locale"}/{content attr="id"}"}" />
+{/block}
+
 {* Breadcrumb *}
 {block name='no-return-functions' append}
     {$breadcrumbs = []}
diff --git a/templates/frontOffice/default/layout.tpl b/templates/frontOffice/default/layout.tpl
index ab57fe8da..8a2d06a4c 100644
--- a/templates/frontOffice/default/layout.tpl
+++ b/templates/frontOffice/default/layout.tpl
@@ -64,6 +64,11 @@ GNU General Public License : http://www.gnu.org/licenses/
     {images file='assets/img/favicon.ico'}<link rel="shortcut icon" type="image/x-icon" href="{$asset_url}">{/images}
     {images file='assets/img/favicon.png'}<link rel="icon" type="image/png" href="{$asset_url}" />{/images}
 
+    {* Feeds *}
+    <link rel="alternate" type="application/rss+xml" title="{intl l='All products'}" href="{url path="/feed/catalog/{lang attr="locale"}"}" />
+    <link rel="alternate" type="application/rss+xml" title="{intl l='All contents'}" href="{url path="/feed/content/{lang attr="locale"}"}" />
+    {block name="feeds"}{/block}
+
     {* HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries *}
     <!--[if lt IE 9]>
     <script src="//oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>

From bddda57601ea25cdd7fa522e55af8073808aca7e Mon Sep 17 00:00:00 2001
From: Julien Chanseaume <julien.chanseaume@gmail.com>
Date: Mon, 5 May 2014 07:22:52 +0200
Subject: [PATCH 7/9] small fixes

---
 local/modules/Front/Controller/FeedController.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/local/modules/Front/Controller/FeedController.php b/local/modules/Front/Controller/FeedController.php
index d9e3a5c5c..7fc95ed77 100644
--- a/local/modules/Front/Controller/FeedController.php
+++ b/local/modules/Front/Controller/FeedController.php
@@ -70,7 +70,7 @@ class FeedController extends BaseFrontController {
             $this->pageNotFound();
         }
 
-        // the locale : fr, en,
+        // the locale : fr_FR, en_US,
         if ("" !== $lang) {
             if (! $this->checkLang($lang)){
                 $this->pageNotFound();
@@ -162,8 +162,8 @@ class FeedController extends BaseFrontController {
     /**
      * Check if a lang is used
      *
-     * @param $lang The lang code. e.g.: fr
-     * @return bool true if the language is used, otherwise false
+     * @param $lang string  The lang code. e.g.: fr
+     * @return bool         true if the language is used, otherwise false
      */
     private function checkLang($lang)
     {
@@ -176,7 +176,7 @@ class FeedController extends BaseFrontController {
 
 
     /**
-     * Ckeck if the element exists and is visible
+     * Check if the element exists and is visible
      *
      * @param $context string   catalog or content
      * @param $id string        id of the element

From 913ce22724d8484475e693d2897d9597a3b6a69f Mon Sep 17 00:00:00 2001
From: Julien Chanseaume <julien.chanseaume@gmail.com>
Date: Mon, 5 May 2014 07:23:48 +0200
Subject: [PATCH 8/9] added french translation

---
 templates/frontOffice/default/I18n/en_US.php |  0
 templates/frontOffice/default/I18n/fr_FR.php |  4 ++++
 templates/frontOffice/default/category.html  |  2 +-
 templates/frontOffice/default/content.html   |  2 +-
 templates/frontOffice/default/feed.html      | 18 +++++++++---------
 5 files changed, 15 insertions(+), 11 deletions(-)
 mode change 100644 => 100755 templates/frontOffice/default/I18n/en_US.php
 mode change 100644 => 100755 templates/frontOffice/default/I18n/fr_FR.php

diff --git a/templates/frontOffice/default/I18n/en_US.php b/templates/frontOffice/default/I18n/en_US.php
old mode 100644
new mode 100755
diff --git a/templates/frontOffice/default/I18n/fr_FR.php b/templates/frontOffice/default/I18n/fr_FR.php
old mode 100644
new mode 100755
index 3266cc152..2a8a52dda
--- a/templates/frontOffice/default/I18n/fr_FR.php
+++ b/templates/frontOffice/default/I18n/fr_FR.php
@@ -16,6 +16,10 @@ return array(
     'Address' => 'Adresse',
     'Address %nb' => 'Adresse n°',
     'Address Update' => 'Mise à jour de l\'adresse',
+    'All contents' => 'Tous les contenus',
+    'All contents in' => 'tous les contenus de',
+    'All products' => 'Tous les produits',
+    'All products in' => 'Tous les produits de',
     'Amount' => 'Montant',
     'Availability' => 'Disponibilité',
     'Available' => 'Disponible',
diff --git a/templates/frontOffice/default/category.html b/templates/frontOffice/default/category.html
index 6f1b11045..719f91395 100644
--- a/templates/frontOffice/default/category.html
+++ b/templates/frontOffice/default/category.html
@@ -20,7 +20,7 @@
 
 {* Feeds *}
 {block name="feeds"}
-    <link rel="alternate" type="application/rss+xml" title="{intl l='All products for'} {category attr='title'}" href="{url path="/feed/catalog/{lang attr="locale"}/{content attr="id"}"}" />
+    <link rel="alternate" type="application/rss+xml" title="{intl l='All products in'} {category attr='title'}" href="{url path="/feed/catalog/{lang attr="locale"}/{content attr="id"}"}" />
 {/block}
 
 {* Breadcrumb *}
diff --git a/templates/frontOffice/default/content.html b/templates/frontOffice/default/content.html
index d357487ea..398072a39 100644
--- a/templates/frontOffice/default/content.html
+++ b/templates/frontOffice/default/content.html
@@ -20,7 +20,7 @@
 
 {* Feeds *}
 {block name="feeds"}
-<link rel="alternate" type="application/rss+xml" title="{intl l='All contents for'} {content attr='title'}" href="{url path="/feed/content/{lang attr="locale"}/{content attr="id"}"}" />
+<link rel="alternate" type="application/rss+xml" title="{intl l='All contents in'} {content attr='title'}" href="{url path="/feed/content/{lang attr="locale"}/{content attr="id"}"}" />
 {/block}
 
 {* Breadcrumb *}
diff --git a/templates/frontOffice/default/feed.html b/templates/frontOffice/default/feed.html
index f24477796..2dd35a832 100644
--- a/templates/frontOffice/default/feed.html
+++ b/templates/frontOffice/default/feed.html
@@ -8,7 +8,7 @@
 {if $_context_ == "catalog"}
     <channel>
     {if $_id_ == "" }
-        <title>{intl l="Catalog"} | {$store_name}</title>
+        <title>{intl l="All products in"} {$store_name}</title>
         <link>{url path="/"}</link>
         <description>{$store_name}</description>
         <language>{$locale|replace:'_':'-'|lower}</language>
@@ -16,7 +16,7 @@
         <generator>Thelia 2.0</generator>
     {else}
         {loop type="category" name="category" id=$_id_ lang=$_lang_ }
-        <title>{$TITLE} | {$store_name}</title>
+        <title>{intl l="All products in"} {$TITLE} - {$store_name}</title>
         <link>{$URL}</link>
         <description>{$CHAPO}</description>
         <language>{$LOCALE|replace:'_':'-'|lower}</language>
@@ -37,16 +37,16 @@
     </channel>
 {else}
     <channel>
-        {if $_id_ == "" }
-        <title>{intl l="Contents"} | {$store_name}</title>
+    {if $_id_ == "" }
+        <title>{intl l="All contents in"} {$store_name}</title>
         <link>{url path="/"}</link>
         <description>{$store_name}</description>
         <language>{$locale|replace:'_':'-'|lower}</language>
         <lastBuildDate>{$smarty.now|date_format:'r'}</lastBuildDate>
         <generator>Thelia 2.0</generator>
-        {else}
+    {else}
         {loop type="folder" name="folder" id=$_id_ lang=$_lang_ }
-        <title>{$TITLE} | {$store_name}</title>
+        <title>{intl l="All contents in"} {$TITLE} - {$store_name}</title>
         <link>{$URL}</link>
         <description>{$CHAPO}</description>
         <language>{$LOCALE|replace:'_':'-'|lower}</language>
@@ -54,8 +54,8 @@
         <lastBuildDate>{$smarty.now|date_format:'r'}</lastBuildDate>
         <generator>Thelia 2.0</generator>
         {/loop}
-        {/if}
-        {loop type="content" name="content" folder_default=$_id_ lang=$_lang_ }
+    {/if}
+    {loop type="content" name="content" folder_default=$_id_ lang=$_lang_ }
         <item>
             <title>{$TITLE}</title>
             <link>{$URL}</link>
@@ -63,7 +63,7 @@
             <pubDate>{format_date date=$CREATE_DATE format="r"}</pubDate>
             <guid>{$URL}</guid>
         </item>
-        {/loop}
+    {/loop}
     </channel>
 {/if}
 </rss>

From 3fd87f1fa1496b107e3ca957bfa69c204b02a8ff Mon Sep 17 00:00:00 2001
From: Julien Chanseaume <julien.chanseaume@gmail.com>
Date: Mon, 5 May 2014 07:34:09 +0200
Subject: [PATCH 9/9] updated sql script

---
 setup/insert.sql       | 3 ++-
 setup/update/2.0.1.sql | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/setup/insert.sql b/setup/insert.sql
index e751f8805..adb1b0822 100644
--- a/setup/insert.sql
+++ b/setup/insert.sql
@@ -46,7 +46,8 @@ INSERT INTO `config` (`name`, `value`, `secured`, `hidden`, `created_at`, `updat
 ('thelia_extra_version','', 1, 1, NOW(), NOW()),
 ('front_cart_country_cookie_name','fcccn', 1, 1, NOW(), NOW()),
 ('front_cart_country_cookie_expires','2592000', 1, 1, NOW(), NOW()),
-('sitemap_ttl','7200', 1, 1, NOW(), NOW());
+('sitemap_ttl','7200', 1, 1, NOW(), NOW()),
+('feed_ttl','7200', 1, 1, NOW(), NOW());
 
 
 INSERT INTO `config_i18n` (`id`, `locale`, `title`, `description`, `chapo`, `postscriptum`) VALUES
diff --git a/setup/update/2.0.1.sql b/setup/update/2.0.1.sql
index 7b91f3232..e1afc48a9 100644
--- a/setup/update/2.0.1.sql
+++ b/setup/update/2.0.1.sql
@@ -12,6 +12,8 @@ INSERT INTO `config` (`name`, `value`, `secured`, `hidden`, `created_at`, `updat
 ('front_cart_country_cookie_expires','2592000', 1, 1, NOW(), NOW());
 INSERT INTO `config` (`name`, `value`, `secured`, `hidden`, `created_at`, `updated_at`) VALUES
 ('sitemap_ttl','7200', 1, 1, NOW(), NOW());
+INSERT INTO `config` (`name`, `value`, `secured`, `hidden`, `created_at`, `updated_at`) VALUES
+('feed_ttl','7200', 1, 1, NOW(), NOW());
 
 ALTER TABLE `module` ADD INDEX `idx_module_activate` (`activate`);