Subversion Repositories Applications.papyrus

Compare Revisions

Ignore whitespace Rev 1358 → Rev 1359

/trunk/client/bazar/langues/baz_langue_fr.inc.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: baz_langue_fr.inc.php,v 1.51 2007-04-20 09:57:21 florian Exp $
// CVS : $Id: baz_langue_fr.inc.php,v 1.52 2007-04-20 12:47:42 florian Exp $
/**
* Fichier de traduction en français de l'application Bazar
*
30,7 → 30,7
//Autres auteurs :
*@author Aucun
*@copyright Tela-Botanica 2000-2004
*@version $Revision: 1.51 $ $Date: 2007-04-20 09:57:21 $
*@version $Revision: 1.52 $ $Date: 2007-04-20 12:47:42 $
// +------------------------------------------------------------------------------------------------------+
*/
 
408,6 → 408,9
define ('BAZ_ADRESSE', 'Adresse');
define ('BAZ_ADRESSE_REQUIS', 'Adresse requise');
define ('BAZ_FAX', 'Fax');
//define ('BAZ_DERNIERES_FICHES', 'Dernières fiches enregistrées');
define ('BAZ_FICHE_NUMERO', 'Fiches n');
define ('BAZ_ECRITE', ' écrite par ');
 
//================ Administration de Bazar ================================
define ('BAZ_CONFIG', 'Configuration du bazar');
448,6 → 451,9
/* +--Fin du code ----------------------------------------------------------------------------------------+
*
* $Log: not supported by cvs2svn $
* Revision 1.51 2007/04/20 09:57:21 florian
* correction bugs suite au merge
*
* Revision 1.50 2007/04/11 08:30:12 neiluj
* remise en état du CVS...
*
/trunk/client/bazar/documentation/bazar.sql
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/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.81 2007-04-20 09:59:41 florian Exp $
// CVS : $Id: bazar.fonct.rss.php,v 1.82 2007-04-20 12:47:42 florian 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.81 $
*@version $Revision: 1.82 $
// +------------------------------------------------------------------------------------------------------+
*/
 
619,7 → 619,7
$requete_nom_flux = 'select bn_label_nature from bazar_nature where bn_id_nature = '.$typeannonce;
$nomflux = $GLOBALS['_BAZAR_']['db']->getOne($requete_nom_flux) ;
}
// Cas où il y plusieurs type d annonce demande
// Cas ou il y plusieurs type d annonce demande
if (is_array ($typeannonce)) {
if ($req_where==1) {$requete .= ' AND ';}
$requete .= 'bf_ce_nature IN (' ;
688,11 → 688,11
$xml .= "\r\n ";
$xml .= XML_Util::createStartElement ('channel');
$xml .= "\r\n ";
$xml .= XML_Util::createTag ('title', null, html_entity_decode($nomflux));
$xml .= XML_Util::createTag ('title', null, utf8_encode(html_entity_decode($nomflux)));
$xml .= "\r\n ";
$xml .= XML_Util::createTag ('link', null, BAZ_RSS_ADRESSESITE);
$xml .= XML_Util::createTag ('link', null, utf8_encode(html_entity_decode(BAZ_RSS_ADRESSESITE)));
$xml .= "\r\n ";
$xml .= XML_Util::createTag ('description', null, BAZ_RSS_DESCRIPTIONSITE);
$xml .= XML_Util::createTag ('description', null, utf8_encode(html_entity_decode(BAZ_RSS_DESCRIPTIONSITE)));
$xml .= "\r\n ";
$xml .= XML_Util::createTag ('language', null, 'fr-FR');
$xml .= "\r\n ";
1016,7 → 1016,7
$GLOBALS['_BAZAR_']['url']->addQueryString('action',BAZ_VOIR_FLUX_RSS);
$GLOBALS['_BAZAR_']['url']->addQueryString('annonce',$GLOBALS['_BAZAR_']['id_typeannonce']);
if ($GLOBALS['_BAZAR_']['categorie_nature']!=0) $GLOBALS['_BAZAR_']['url']->addQueryString('categorie_nature',$GLOBALS['_BAZAR_']['categorie_nature']);
$res .= '{{Syndication titre="Derni&egrave;res actualit&eacute;s" url="'.$GLOBALS['_BAZAR_']['url']->getURL().'" nb=10 nouvellefenetre=0 formatdate="'.BAZ_TYPE_AFFICHAGE_LISTE.'"}}';
$res .= '{{Syndication titre="'.BAZ_DERNIERES_FICHES.'" url="'.$GLOBALS['_BAZAR_']['url']->getURL().'" nb=10 nouvellefenetre=0 formatdate="'.BAZ_TYPE_AFFICHAGE_LISTE.'"}}';
}
}
1177,6 → 1177,9
/* +--Fin du code ----------------------------------------------------------------------------------------+
*
* $Log: not supported by cvs2svn $
* Revision 1.81 2007/04/20 09:59:41 florian
* et un echo en moins!
*
* Revision 1.80 2007/04/20 09:57:21 florian
* correction bugs suite au merge
*
/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.4 2007-03-28 15:53:27 florian Exp $
// CVS : $Id: syndication.php,v 1.5 2007-04-20 12:50:18 florian Exp $
/**
* papyrus_bp - syndication.php
*
33,7 → 33,7
//Autres auteurs :
*@author Aucun
*@copyright Tela-Botanica 1999-2006
*@version $Revision: 1.4 $ $Date: 2007-03-28 15:53:27 $
*@version $Revision: 1.5 $ $Date: 2007-04-20 12:50:18 $
// +------------------------------------------------------------------------------------------------------+
*/
 
135,8 → 135,7
foreach ($tab_url as $cle => $url) {
if ($url != '') {
$aso_site = array();
$url = str_replace('&amp;', '&', $url) ;
$rss =& new XML_RSS($url);
$rss =& new XML_RSS(str_replace('&amp;', '&', $url));
$rss->parse();
if ($options['template'] != '' && !file_exists($options['template'])) {
$i = 0 ;
179,6 → 178,7
return $res;
}
$channel=$rss->getChannelInfo();
//var_dump($channel);
// Gestion du titre
if ( $options['titre'] == '' ) {
$aso_site['titre'] = utf8_decode($channel['title']);
258,7 → 258,7
}
}
// Trie des pages par date
//var_dump($GLOBALS['_SYNDICATION_']);
//var_dump($GLOBALS['_SYNDICATION_']['pages']);
krsort($GLOBALS['_SYNDICATION_']['pages']);
//+----------------------------------------------------------------------------------------------------------------+
282,6 → 282,9
/* +--Fin du code ----------------------------------------------------------------------------------------+
*
* $Log: not supported by cvs2svn $
* Revision 1.4 2007/03/28 15:53:27 florian
* correction pb date, encodage utf-8
*
* Revision 1.3 2007/01/23 14:17:19 alexandre_tb
* backport : hack pour rattraper les dates du type 01012005 parsees par magpie
* lorsque les flux donne des dates au format iso