| 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.2.1 2007-11-30 14:14:36 jp_milcent Exp $ |
| // CVS : $Id: bazar.fonct.rss.php,v 1.99.2.2 2007-11-30 15:02:50 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.99.2.1 $ |
| *@version $Revision: 1.99.2.2 $ |
| // +------------------------------------------------------------------------------------------------------+ |
| */ |
| |
| 162,7 → 162,8 |
|---|
| } |
| } |
| } |
| $requete = 'SELECT *,bn_label_nature FROM bazar_fiche,bazar_nature WHERE bf_ce_nature=bn_id_nature and bf_id_fiche='.$GLOBALS['_BAZAR_']['id_fiche']; |
| $requete = 'SELECT * FROM bazar_fiche,bazar_nature WHERE bf_ce_nature=bn_id_nature and bf_id_fiche='.$GLOBALS['_BAZAR_']['id_fiche']; |
| |
| if (isset($GLOBALS['_BAZAR_']['langue'])) $requete .= ' and bn_ce_i18n like "'.$GLOBALS['_BAZAR_']['langue'].'"'; |
| $resultat = $GLOBALS['_BAZAR_']['db']->query($requete) ; |
| (DB::isError($resultat)) ? die (BOG_afficherErreurSql(__FILE__, __LINE__, $resultat->getMessage(), $requete)) |
| 178,21 → 179,12 |
|---|
| // mais on dispose de la constante BAZ_NUM_ANNONCE_CALENDRIER |
| if (!isset($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,bn_label_nature FROM bazar_nature where 1'; |
| if ($GLOBALS['_BAZAR_']['id_typeannonce'] != 'toutes') $requete .= ' and bn_id_nature in ('.$GLOBALS['_BAZAR_']['id_typeannonce'].')'; |
| if (isset($GLOBALS['_BAZAR_']['langue'])) $requete .= ' and bn_ce_i18n like "'.$GLOBALS['_BAZAR_']['langue'].'"'; |
| $resultat = $GLOBALS['_BAZAR_']['db']->query($requete) ; |
| if (DB::isError($resultat)) { |
| return ($resultat->getMessage().$resultat->getDebugInfo()) ; |
| } |
| $result = $resultat->fetchRow(DB_FETCHMODE_ASSOC); |
| $id_nature = $result['bn_id_nature']; |
| if (!isset($GLOBALS['_BAZAR_']['template'])) $GLOBALS['_BAZAR_']['template'] = $result['bn_template']; |
| if (!isset($GLOBALS['_BAZAR_']['commentaire'])) $GLOBALS['_BAZAR_']['commentaire'] = $result['bn_commentaire']; |
| if (!isset($GLOBALS['_BAZAR_']['class'])) $GLOBALS['_BAZAR_']['class'] = $result['bn_label_class']; |
| if (!isset($GLOBALS['_BAZAR_']['template'])) $GLOBALS['_BAZAR_']['template'] = $ligne['bn_template']; |
| if (!isset($GLOBALS['_BAZAR_']['commentaire'])) $GLOBALS['_BAZAR_']['commentaire'] = $ligne['bn_commentaire']; |
| if (!isset($GLOBALS['_BAZAR_']['class'])) $GLOBALS['_BAZAR_']['class'] = $ligne['bn_label_class']; |
| |
| $utilisateur = new Administrateur_bazar ($GLOBALS['AUTH']); |
| if ($utilisateur->isAdmin($result['bn_id_nature']) || $utilisateur->isSuperAdmin()) { |
| if ($utilisateur->isAdmin($ligne['bn_id_nature']) || $utilisateur->isSuperAdmin()) { |
| $est_admin=1; |
| } |
| |
| 200,11 → 192,11 |
|---|
| $res .= '<div class="BAZ_cadre_fiche BAZ_cadre_fiche_'.$GLOBALS['_BAZAR_']['class'].'">'."\n"; |
| //affiche le titre sous forme d'image |
| if (isset ($GLOBALS['_BAZAR_']['image_titre']) && $GLOBALS['_BAZAR_']['image_titre']!='') { |
| $res .= '<img class="BAZ_img_titre" src="client/bazar/images/'.$GLOBALS['_BAZAR_']['image_titre'].'" alt="'.$result['bn_label_nature'].'" />'.'<br />'."\n"; |
| $res .= '<img class="BAZ_img_titre" src="client/bazar/images/'.$GLOBALS['_BAZAR_']['image_titre'].'" alt="'.$ligne['bn_label_nature'].'" />'.'<br />'."\n"; |
| } |
| //affiche le texte sinon |
| else { |
| $res .= '<h2 class="BAZ_titre BAZ_titre_'.$GLOBALS['_BAZAR_']['class'].'">'.$result['bn_label_nature'].'</h2>'."\n"; |
| $res .= '<h2 class="BAZ_titre BAZ_titre_'.$GLOBALS['_BAZAR_']['class'].'">'.$ligne['bn_label_nature'].'</h2>'."\n"; |
| } |
| $GLOBALS['_BAZAR_']['annonceur'] = $ligne['bf_ce_utilisateur'] ; |
| //si le template existe, on genere le template |
| 1249,6 → 1241,9 |
|---|
| /* +--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 |
| * |