diff --git a/htdocs/includes/boxes/box_external_rss.php b/htdocs/includes/boxes/box_external_rss.php index 3ef2a13e9d3..a44f83fd1ce 100644 --- a/htdocs/includes/boxes/box_external_rss.php +++ b/htdocs/includes/boxes/box_external_rss.php @@ -66,15 +66,19 @@ class box_external_rss extends ModeleBoxes { */ function loadBox($max=5) { - global $user, $langs; + global $user, $langs, $conf; $langs->load("boxes"); // On recupere numero de param de la boite ereg('^([0-9]+) ',$this->param,$reg); $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 $url=@constant("EXTERNAL_RSS_URLRSS_".$site); + //define('MAGPIE_DEBUG',1); $rss=fetch_rss($url); if (! is_object($rss)) { @@ -101,7 +105,7 @@ class box_external_rss extends ModeleBoxes { } // INFO sur le élements - for($i = 0; $i < $max ; $i++) + for($i = 0; $i < $max && $i < sizeof($rss->items); $i++) { $item = $rss->items[$i]; @@ -109,7 +113,7 @@ class box_external_rss extends ModeleBoxes { $href = $item['link']; $title = urldecode($item['title']); $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['dc']['date'])) $date=$item['dc']['date']; diff --git a/htdocs/includes/boxes/modules_boxes.php b/htdocs/includes/boxes/modules_boxes.php index 64c781dd827..5dbfc33c341 100644 --- a/htdocs/includes/boxes/modules_boxes.php +++ b/htdocs/includes/boxes/modules_boxes.php @@ -36,11 +36,11 @@ class ModeleBoxes { var $MAXLENGTHBOX=60; // Mettre 0 pour pas de limite - + var $error=''; - /** + /** \brief Renvoi le dernier message d'erreur de création de facture */ function error() @@ -49,7 +49,7 @@ class ModeleBoxes } - /** + /** \brief Methode standard d'affichage des boites \param $head tableau des caractéristiques du titre \param $contents tableau des lignes de contenu @@ -60,30 +60,41 @@ class ModeleBoxes $bcx[0] = 'class="box_pair"'; $bcx[1] = 'class="box_impair"'; - + $var = true; $nbcol=sizeof($contents[0])+1; $nblines=sizeof($contents); - + print "\n\n\n"; print 'boxid)) print ' id="boxobject_'.$this->boxid.'"'; print '>'; - + // Affiche titre de la boite - print 'use_ajax) print ' style="cursor:move;"'; - print '>'; + print ''; print ' 0) { print ' colspan="'.$nbcol.'"'; } print '>'; + + if ($conf->use_ajax) + { + print '
'; - + if ($conf->use_ajax) + { + print '
'; + } print dolibarr_trunc($head['text'],isset($head['limit'])?$head['limit']:$this->MAXLENGTHBOX); if ($head['sublink']) { print ' '.img_picto($head['subtext'],$head['subpicto']).''; } - print '
'; + print img_picto($langs->trans("Move"),'uparrow','style="cursor:move;"'); + print '
'; + } + + print ''; + print ''; + // Affiche chaque ligne de la boite for ($i=0, $n=$nblines; $i < $n; $i++) { @@ -95,7 +106,7 @@ class ModeleBoxes if (isset($contents[$i][-1]['class'])) print ''; else print ''; } - + // Affiche chaque cellule for ($j=0, $m=isset($contents[$i][-1])?sizeof($contents[$i])-1:sizeof($contents[$i]); $j < $m; $j++) { @@ -106,7 +117,7 @@ class ModeleBoxes if (isset($contents[$i][$j]['colspan'])) $tdparam.=' colspan="'. $contents[$i][$j]['colspan'].'"'; if (isset($contents[$i][$j]['class'])) $tdparam.=' class="'. $contents[$i][$j]['class'].'"'; if (isset($contents[$i][$j]['td'])) $tdparam.=' '.$contents[$i][$j]['td']; - + if (!$contents[$i][$j]['text']) $contents[$i][$j]['text']=""; $texte=isset($contents[$i][$j]['text'])?$contents[$i][$j]['text']:''; $textewithnotags=eregi_replace('<[^>]+>','',$texte); @@ -116,7 +127,7 @@ class ModeleBoxes if (isset($contents[$i][$j]['logo']) && $contents[$i][$j]['logo']) print ''; else print ''; - + // Picto if (isset($contents[$i][$j]['url'])) { print ''; } - + // Texte if (isset($contents[$i][$j]['logo']) && $contents[$i][$j]['logo']) { @@ -142,7 +153,7 @@ class ModeleBoxes } $maxlength=$this->MAXLENGTHBOX; if (isset($contents[$i][$j]['maxlength'])) $maxlength=$contents[$i][$j]['maxlength']; - + if ($maxlength && strlen($textewithnotags) > $maxlength) { $texte=substr($texte,0,$maxlength)."..."; @@ -156,17 +167,17 @@ class ModeleBoxes print $texte2; print ""; } - + if (sizeof($contents[$i])) print ''; } } - + print ""; - + print "\n\n\n"; - + } - + }