Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Amlioration gestion erreur sur boites RSS quand pas de connexion rseau

Browse Source
This commit is contained in:
Laurent Destailleur
2006-11-05 16:29:42 +00:00
parent c1ec2503ce
commit f98bd2ef29
2 changed files with 39 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/includes/boxes/box_external_rss.php
View File

@@ -66,15 +66,19 @@ class box_external_rss extends ModeleBoxes {
*/ */
function loadBox($max=5) function loadBox($max=5)
{ {
global $user, $langs; global $user, $langs, $conf;
$langs->load("boxes"); $langs->load("boxes");
// On recupere numero de param de la boite // On recupere numero de param de la boite
ereg('^([0-9]+) ',$this->param,$reg); ereg('^([0-9]+) ',$this->param,$reg);
$site=$reg[1]; $site=$reg[1];
// Creation rep (pas besoin, on le cree apres recup flux)
//$result=create_exdir($conf->externalrss->dir_temp);
// Recupere flux RSS definie dans EXTERNAL_RSS_URLRSS_$site // Recupere flux RSS definie dans EXTERNAL_RSS_URLRSS_$site
$url=@constant("EXTERNAL_RSS_URLRSS_".$site); $url=@constant("EXTERNAL_RSS_URLRSS_".$site);
//define('MAGPIE_DEBUG',1);
$rss=fetch_rss($url); $rss=fetch_rss($url);
if (! is_object($rss)) if (! is_object($rss))
{ {
@@ -101,7 +105,7 @@ class box_external_rss extends ModeleBoxes {
} }
// INFO sur le <20>lements // INFO sur le <20>lements
for($i = 0; $i < $max ; $i++) for($i = 0; $i < $max && $i < sizeof($rss->items); $i++)
{ {
$item = $rss->items[$i]; $item = $rss->items[$i];
@@ -109,7 +113,7 @@ class box_external_rss extends ModeleBoxes {
$href = $item['link']; $href = $item['link'];
$title = urldecode($item['title']); $title = urldecode($item['title']);
$date = $item['date_timestamp']; // date will be empty if conversion into timestamp failed $date = $item['date_timestamp']; // date will be empty if conversion into timestamp failed
if ($rss->is_rss()) // If RSS if ($rss->is_rss()) // If RSS
{ {
if (! $date && isset($item['pubdate'])) $date=$item['pubdate']; if (! $date && isset($item['pubdate'])) $date=$item['pubdate'];
if (! $date && isset($item['dc']['date'])) $date=$item['dc']['date']; if (! $date && isset($item['dc']['date'])) $date=$item['dc']['date'];

19
htdocs/includes/boxes/modules_boxes.php
View File

@@ -71,18 +71,29 @@ class ModeleBoxes
print '>'; print '>';
// Affiche titre de la boite // Affiche titre de la boite
print '<tr class="box_titre"'; print '<tr class="box_titre">';
if ($conf->use_ajax) print ' style="cursor:move;"';
print '>';
print '<td'; print '<td';
if ($nbcol > 0) { print ' colspan="'.$nbcol.'"'; } if ($nbcol > 0) { print ' colspan="'.$nbcol.'"'; }
print '>'; print '>';
if ($conf->use_ajax)
{
print '<table class="nobordernopadding" width="100%"><tr><td align="left">';
}
print dolibarr_trunc($head['text'],isset($head['limit'])?$head['limit']:$this->MAXLENGTHBOX); print dolibarr_trunc($head['text'],isset($head['limit'])?$head['limit']:$this->MAXLENGTHBOX);
if ($head['sublink']) if ($head['sublink'])
{ {
print ' <a href="'.$head['sublink'].'" target="_new">'.img_picto($head['subtext'],$head['subpicto']).'</a>'; print ' <a href="'.$head['sublink'].'" target="_new">'.img_picto($head['subtext'],$head['subpicto']).'</a>';
} }
print '</td></tr>'; if ($conf->use_ajax)
{
print '</td><td class="nocellnopadd" width="14">';
print img_picto($langs->trans("Move"),'uparrow','style="cursor:move;"');
print '</td></tr></table>';
}
print '</td>';
print '</tr>';
// Affiche chaque ligne de la boite // Affiche chaque ligne de la boite
for ($i=0, $n=$nblines; $i < $n; $i++) for ($i=0, $n=$nblines; $i < $n; $i++)