dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[*] MO : Merge of https://github.com/PrestaShop/PrestaShop/pull/721

Browse Source
This commit is contained in:
gRoussac
2013-11-27 19:21:57 +01:00
parent 76f115ac22
commit 65106c6a24
1 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/blockrss/blockrss.php
+27 -27
View File
@@ -124,36 +124,36 @@ class Blockrss extends Module
$url = strval(Configuration::get('RSS_FEED_URL'));
$nb = (int)(Configuration::get('RSS_FEED_NBR'));
// Getting data
$rss_links = array();
if ($url && ($contents = Tools::file_get_contents($url)))
try
{
if (@$src = new XML_Feed_Parser($contents)) {
for ($i = 0; $i < ($nb ? $nb : 5); $i++) {
if (@$item = $src->getEntryByOffset($i)) {
$xmlValues = array();
foreach(self::$xmlFields as $xmlField) {
$xmlValues[$xmlField] = $item->__get($xmlField);
$cacheId = $this->getCacheId($this->name.'-'.date("YmdH"));
if (!$this->isCached('blockrss.tpl', $cacheId))
{
// Getting data
$rss_links = array();
if ($url && ($contents = Tools::file_get_contents($url)))
try
{
if (@$src = new XML_Feed_Parser($contents))
for ($i = 0; $i < ($nb ? $nb : 5); $i++)
if (@$item = $src->getEntryByOffset($i))
{
$xmlValues = array();
foreach(self::$xmlFields as $xmlField)
$xmlValues[$xmlField] = $item->__get($xmlField);
$xmlValues['enclosure'] = $item->getEnclosure();
# Compatibility
$xmlValues['url'] = $xmlValues['link'];
$rss_links[] = $xmlValues;
}
$xmlValues['enclosure'] = $item->getEnclosure();
# Compatibility
$xmlValues['url'] = $xmlValues['link'];
$rss_links[] = $xmlValues;
}
}
}
}
catch (XML_Feed_Parser_Exception $e)
{
Tools::dieOrLog(sprintf($this->l('Error: invalid RSS feed in "blockrss" module: %s'), $e->getMessage()), false);
}
catch (XML_Feed_Parser_Exception $e)
{
Tools::dieOrLog(sprintf($this->l('Error: invalid RSS feed in "blockrss" module: %s'), $e->getMessage()), false);
}
// Display smarty
$this->smarty->assign(array('title' => ($title ? $title : $this->l('RSS feed')), 'rss_links' => $rss_links));
}
// Display smarty
$this->smarty->assign(array('title' => ($title ? $title : $this->l('RSS feed')), 'rss_links' => $rss_links));
return $this->display(__FILE__, 'blockrss.tpl');
return $this->display(__FILE__, 'blockrss.tpl', $cacheId);
}
function hookRightColumn($params)