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.72 2007-03-28 08:51:22 neiluj Exp $ |
// CVS : $Id: bazar.fonct.rss.php,v 1.73 2007-03-28 10:01:47 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.72 $ |
*@version $Revision: 1.73 $ |
// +------------------------------------------------------------------------------------------------------+ |
*/ |
|
556,7 → 556,7 |
$requete .= 'bf_statut_fiche='.$valide; |
$req_where=1; |
} |
$nomflux=BAZ_DERNIERE_ACTU; |
$nomflux=html_entity_decode(BAZ_DERNIERE_ACTU); |
if (!is_array ($typeannonce) && $typeannonce!='' and $typeannonce!='toutes') { |
if ($req_where==1) {$requete .= ' AND ';} |
$requete .= 'bf_ce_nature='.$typeannonce.' and bf_ce_nature=bn_id_nature ';; |
641,7 → 641,6 |
|
// passage en utf-8 --julien |
// -- |
// TODO: retour à la ligne (CRLF) et indentation du code pour la lisibilité |
|
// setlocale() pour avoir les formats de date valides (w3c) --julien |
setlocale(LC_TIME, "C"); |
869,7 → 868,7 |
$_REQUEST['nature'] = $tableau_typeannonces[0]; |
} |
} |
// Récupération du template |
// Recuperation du template |
$requete = 'SELECT bn_template FROM bazar_nature WHERE bn_id_nature = '.$_REQUEST['nature']; |
$resultat = $GLOBALS['_BAZAR_']['db']->getOne($requete) ; |
if (DB::isError($resultat)) { |
960,16 → 959,24 |
$requeteWhere = 'bf_ce_nature="'.$_REQUEST['nature'].'" AND '.$requeteWhere; |
} |
|
if (BAZ_UTILISE_TEMPLATE) { |
// Appel du template n 1 |
include_once BAZ_CHEMIN_APPLI.'bibliotheque/bazarTemplate.class.php' ; |
include_once BAZ_CHEMIN_APPLI.'bibliotheque/bazarTemplate.class.php' ; |
|
$template = new bazarTemplate ($GLOBALS['_BAZAR_']['db']) ; |
$chaine = $template->getTemplate(1, $GLOBALS['_BAZAR_']['langue'], $GLOBALS['_BAZAR_']['categorie_nature']); |
if (bazarTemplate::isError ($chaine)) return $chaine->getMessage() ; |
ob_start(); |
eval ($chaine) ; |
$res .= ob_get_contents(); |
ob_end_clean() ; |
$template = new bazarTemplate ($GLOBALS['_BAZAR_']['db']) ; |
$chaine = $template->getTemplate(1, $GLOBALS['_BAZAR_']['langue'], $GLOBALS['_BAZAR_']['categorie_nature']); |
if (bazarTemplate::isError ($chaine)) return $chaine->getMessage() ; |
ob_start(); |
eval ($chaine) ; |
$res .= ob_get_contents(); |
ob_end_clean() ; |
} else { |
$res .= $formtemplate->toHTML(); |
if (!isset($_REQUEST['recherche_effectuee'])) { |
$res .= '<p class="zone_info">'.BAZ_ENTRER_VOS_CRITERES_DE_RECHERCHE.'</p>'."\n"; |
$res .= '{{Syndication titre="Dernières actualités" url="http://localhost/papyrus/papyrus.php?menu=13&action=18" nb=10 nouvellefenetre=0 formatdate="jma"}}'; |
} |
} |
|
|
|
1090,16 → 1097,38 |
$pager = & Pager::factory($params); |
$data = $pager->getPageData(); |
$links = $pager->getLinks(); |
|
// Appel du template n 2 |
include_once BAZ_CHEMIN_APPLI.'bibliotheque/bazarTemplate.class.php' ; |
$template = new bazarTemplate ($GLOBALS['_BAZAR_']['db']) ; |
$chaine = $template->getTemplate(2, $GLOBALS['_BAZAR_']['langue'], $GLOBALS['_BAZAR_']['categorie_nature']); |
if (bazarTemplate::isError ($chaine)) return $chaine->getMessage() ; |
ob_start(); |
eval ($chaine) ; |
$res .= ob_get_contents(); |
ob_end_clean() ; |
|
if (BAZ_UTILISE_TEMPLATE) { |
//Appel du template n 2 |
include_once BAZ_CHEMIN_APPLI.'bibliotheque/bazarTemplate.class.php' ; |
$template = new bazarTemplate ($GLOBALS['_BAZAR_']['db']) ; |
$chaine = $template->getTemplate(2, $GLOBALS['_BAZAR_']['langue'], $GLOBALS['_BAZAR_']['categorie_nature']); |
if (bazarTemplate::isError ($chaine)) return $chaine->getMessage() ; |
ob_start(); |
eval ($chaine) ; |
$res .= ob_get_contents(); |
ob_end_clean() ; |
} else { |
$res .= '<div class="bazar_numero">'.$pager->links.'</div>'."\n"; |
foreach ($data as $valeur) { |
$GLOBALS['_BAZAR_']['url']->addQueryString('id_fiche', $valeur['bf_id_fiche']) ; |
$GLOBALS['_BAZAR_']['url']->addQueryString('action', BAZ_VOIR_FICHE) ; |
$res .='<li><a href="'.$GLOBALS['_BAZAR_']['url']->getURL().'">'.$valeur['bf_titre'].'</a>'."\n"; |
if ($utilisateur->isSuperAdmin() || $GLOBALS['id_user']==$valeur['bf_ce_utilisateur']) { |
$GLOBALS['_BAZAR_']['url']->addQueryString('action', BAZ_ACTION_MODIFIER); |
$GLOBALS['_BAZAR_']['url']->addQueryString('typeannonce', $GLOBALS['_BAZAR_']['id_typeannonce']); |
$GLOBALS['_BAZAR_']['url']->removeQueryString('personnes'); |
$GLOBALS['_BAZAR_']['url']->removeQueryString('recherche_effectuee'); |
$res .= '<a href="'.$GLOBALS['_BAZAR_']['url']->getURL().'">('.BAZ_MODIFIER.')</a> '; |
$GLOBALS['_BAZAR_']['url']->removeQueryString('action'); |
$GLOBALS['_BAZAR_']['url']->addQueryString('action', BAZ_ACTION_SUPPRESSION); |
$res .='<a href="'.$GLOBALS['_BAZAR_']['url']->getURL().'" onclick="javascript:return confirm(\''.BAZ_SUPPRIMER.'\');">('.BAZ_SUPPRIMER.')</a>'; |
$GLOBALS['_BAZAR_']['url']->removeQueryString('action'); |
} |
$res .= '<ul><li>'.$valeur['bf_etablissement'].'</li></ul>'."\n".'</li>'; |
} |
$res .= '</ul>'."\n".'<div class="bazar_numero">'.$pager->links.'</div>'."\n"; |
} |
|
|
// Nettoyage de l'url |
1114,6 → 1143,11 |
/* +--Fin du code ----------------------------------------------------------------------------------------+ |
* |
* $Log: not supported by cvs2svn $ |
* Revision 1.72 2007/03/28 08:51:22 neiluj |
* passage des flux RSS en UTF-8 |
* ajout de l'indentation du code |
* Vérification validation w3c = OK |
* |
* Revision 1.71 2007/03/19 15:17:37 alexandre_tb |
* correction de la requete de recherche |
* |