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.86 2007-07-04 10:02:42 alexandre_tb Exp $ |
// CVS : $Id: bazar.fonct.rss.php,v 1.87 2007-07-05 08:27:35 alexandre_tb 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.86 $ |
*@version $Revision: 1.87 $ |
// +------------------------------------------------------------------------------------------------------+ |
*/ |
|
178,8 → 178,8 |
// mais on dispose de la constante BAZ_NUM_ANNONCE_CALENDRIER |
if ($GLOBALS['_BAZAR_']['id_typeannonce'] == '' && defined('BAZ_NUM_ANNONCE_CALENDRIER')) $GLOBALS['_BAZAR_']['id_typeannonce'] = BAZ_NUM_ANNONCE_CALENDRIER; |
|
$requete='SELECT bn_id_nature, bn_template, bn_commentaire, bn_label_class FROM bazar_nature '; |
if ($GLOBALS['_BAZAR_']['id_typeannonce'] != 'toutes') $requete .= 'WHERE bn_id_nature='.$GLOBALS['_BAZAR_']['id_typeannonce']; |
$requete='SELECT bn_id_nature, bn_template, bn_commentaire, bn_label_class,bn_label_nature FROM bazar_nature '; |
if ($GLOBALS['_BAZAR_']['id_typeannonce'] != 'toutes') $requete .= 'WHERE bn_id_nature in ('.$GLOBALS['_BAZAR_']['id_typeannonce'].')'; |
|
$resultat = $GLOBALS['_BAZAR_']['db']->query($requete) ; |
if (DB::isError($resultat)) { |
205,7 → 205,7 |
} |
//affiche le texte sinon |
else { |
$res .= '<h2 class="BAZ_titre BAZ_titre_'.$GLOBALS['_BAZAR_']['class'].'">'.$GLOBALS['_BAZAR_']['typeannonce'].'</h2>'."\n"; |
$res .= '<h2 class="BAZ_titre BAZ_titre_'.$GLOBALS['_BAZAR_']['class'].'">'.$result['bn_label_nature'].'</h2>'."\n"; |
} |
$GLOBALS['_BAZAR_']['annonceur'] = $ligne['bf_ce_utilisateur'] ; |
//si le template existe, on genere le template |
335,6 → 335,7 |
$res .= '<span class="BAZ_rubrique BAZ_rubrique_'.$GLOBALS['_BAZAR_']['class'].'" id="date_mise_a_jour">'.BAZ_DATE_MAJ.'</span> '.strftime('%d.%m.%Y %H:%M',strtotime($ligne['bf_date_maj_fiche']))."\n"; |
} |
$res .= '</div>'."\n"; |
|
if ( $est_admin || $GLOBALS['_BAZAR_']['annonceur']==$GLOBALS['AUTH']->getAuthData(BAZ_CHAMPS_ID) ) { |
$res .='<div class="BAZ_actions_fiche BAZ_actions_fiche_'.$GLOBALS['_BAZAR_']['class'].'">'."\n"; |
if ( $est_admin ) { |
369,8 → 370,8 |
$res .= '</div>'."\n"; |
} |
} |
|
$res .= '</div>'."\n"; |
$res .= '</div>'."\n"; |
} |
$res .= '</div>'."\n"; |
|
732,7 → 733,7 |
$xml .= "\r\n "; |
$xml .= XML_Util::createStartElement ('item'); |
$xml .= "\r\n "; |
$xml .= XML_Util::createTag ('title', null, html_entity_decode(($ligne['bf_titre']))); |
$xml .= XML_Util::createTag ('title', null, utf8_encode(html_entity_decode(($ligne['bf_titre'])))); |
$xml .= "\r\n "; |
$lien=$GLOBALS['_BAZAR_']['url']; |
$lien->addQueryString('action', BAZ_VOIR_FICHE); |
744,7 → 745,7 |
$xml .= XML_Util::createStartElement ('description'); |
$xml .= "\r\n "; |
if ($_GET['action'] != BAZ_VOIR_TOUTES_ANNONCES) { |
$xml .= XML_Util::createCDataSection ( html_entity_decode(($ligne['bf_description']))); |
$xml .= XML_Util::createCDataSection ( utf8_encode(html_entity_decode(($ligne['bf_description'])))); |
} |
$xml .= "\r\n "; |
$xml .= XML_Util::createEndElement ('description'); |
1204,6 → 1205,9 |
/* +--Fin du code ----------------------------------------------------------------------------------------+ |
* |
* $Log: not supported by cvs2svn $ |
* Revision 1.86 2007-07-04 10:02:42 alexandre_tb |
* deplacement d une balise <ul> dans la liste des resultats pour conformite xhtml |
* |
* Revision 1.85 2007-06-25 12:15:06 alexandre_tb |
* merge from narmer |
* |