Subversion Repositories Applications.papyrus

Compare Revisions

Ignore whitespace Rev 1736 → Rev 1739

/trunk/papyrus/applettes/syndication/syndication.php
21,7 → 21,7
// | along with Foobar; if not, write to the Free Software |
// | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
// +------------------------------------------------------------------------------------------------------+
// CVS : $Id: syndication.php,v 1.7 2007-07-25 15:09:44 jp_milcent Exp $
// CVS : $Id: syndication.php,v 1.8 2007-11-30 14:17:30 jp_milcent Exp $
/**
* papyrus_bp - syndication.php
*
33,7 → 33,7
//Autres auteurs :
*@author Aucun
*@copyright Tela-Botanica 1999-2006
*@version $Revision: 1.7 $ $Date: 2007-07-25 15:09:44 $
*@version $Revision: 1.8 $ $Date: 2007-11-30 14:17:30 $
// +------------------------------------------------------------------------------------------------------+
*/
 
183,7 → 183,7
}
// Gestion du titre
if ( $options['titre'] == '' ) {
$aso_site['titre'] = utf8_decode($feed->title);
$aso_site['titre'] = mb_convert_encoding($feed->title, 'HTML-ENTITIES', 'UTF-8');
} else if ( $options['titre'] != '0' ) {
$aso_site['titre'] = $options['titre'];
}
207,7 → 207,7
$aso_page = array();
$aso_page['site'] = $aso_site;
$aso_page['url'] = $item->link;
$aso_page['titre'] = utf8_decode($item->title);
$aso_page['titre'] = mb_convert_encoding($item->title, 'HTML-ENTITIES', 'UTF-8');
$aso_page['date'] = $item->pubDate;
if ($options['formatdatepro']) {
switch ($options['formatdatepro']) {
276,6 → 276,12
/* +--Fin du code ----------------------------------------------------------------------------------------+
*
* $Log: not supported by cvs2svn $
* Revision 1.7.2.1 2007-11-30 14:15:02 jp_milcent
* Amélioration du décodage utf8.
*
* Revision 1.7 2007-07-25 15:09:44 jp_milcent
* Fusion avec la livraison Narmer.
*
* Revision 1.5.2.4 2007-07-25 15:07:52 jp_milcent
* Correction problème url.
*
/trunk/client/bazar/bibliotheque/bazar.fonct.rss.php
19,7 → 19,7
// | License along with this library; if not, write to the Free Software |
// | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
// +------------------------------------------------------------------------------------------------------+
// CVS : $Id: bazar.fonct.rss.php,v 1.99 2007-11-05 10:17:19 alexandre_tb Exp $
// CVS : $Id: bazar.fonct.rss.php,v 1.100 2007-11-30 14:17:31 jp_milcent Exp $
/**
*
*@package bazar
28,7 → 28,7
*@author Florian Schmitt <florian@ecole-et-nature.org>
//Autres auteurs :
*@copyright Tela-Botanica 2000-2006
*@version $Revision: 1.99 $
*@version $Revision: 1.100 $
// +------------------------------------------------------------------------------------------------------+
*/
 
766,7 → 766,7
$xml .= "\r\n ";
$xml .= XML_Util::createStartElement ('item');
$xml .= "\r\n ";
$xml .= XML_Util::createTag ('title', null, utf8_encode(html_entity_decode(($ligne['bf_titre']))));
$xml .= XML_Util::createTag('title', null, encoder_en_utf8($ligne['bf_titre']));
$xml .= "\r\n ";
$lien=$GLOBALS['_BAZAR_']['url'];
$lien->addQueryString('action', BAZ_VOIR_FICHE);
778,7 → 778,7
$xml .= XML_Util::createStartElement ('description');
$xml .= "\r\n ";
if ($_GET['action'] != BAZ_VOIR_TOUTES_ANNONCES) {
$xml .= XML_Util::createCDataSection ( utf8_encode(html_entity_decode(($ligne['bf_description']))));
$xml .= XML_Util::createCDataSection(encoder_en_utf8($ligne['bf_description']));
}
$xml .= "\r\n ";
$xml .= XML_Util::createEndElement ('description');
1240,9 → 1240,21
return $res ;
}
 
function encoder_en_utf8($txt) {
// Nous remplaçons l'apostrophe de type RIGHT SINGLE QUOTATION MARK
$cp1252_map = array("\xc2\x92" => "\xe2\x80\x99" /* RIGHT SINGLE QUOTATION MARK */);
return strtr(mb_convert_encoding($txt, 'UTF-8','HTML-ENTITIES'), $cp1252_map);
}
 
/* +--Fin du code ----------------------------------------------------------------------------------------+
*
* $Log: not supported by cvs2svn $
* Revision 1.99.2.1 2007-11-30 14:14:36 jp_milcent
* Ajout d'un décodage des apostrophes de type RIGHT SINGLE QUOTATION MARK.
*
* Revision 1.99 2007-11-05 10:17:19 alexandre_tb
* correction bug: retrait inorportun de la variable menu dans la globale URL
*
* Revision 1.98 2007-10-24 13:27:45 alexandre_tb
* bug d'affichage multiple lorsqu'il y a +sieurs langues
*