Line 220... |
Line 220... |
220 |
$res .= '<div class="BAZ_fiche_image BAZ_fiche_image_'.$GLOBALS['_BAZAR_']['class'].'">'."\n";
|
220 |
$res .= '<div class="BAZ_fiche_image BAZ_fiche_image_'.$GLOBALS['_BAZAR_']['class'].'">'."\n";
|
221 |
$res .= '<img class="BAZ_image" src="client/bazar/images/'.$GLOBALS['_BAZAR_']['image_logo'].'" border=0 alt="'.BAZ_TEXTE_IMG_ALTERNATIF.'" width="130" height="130" />'."\n";
|
221 |
$res .= '<img class="BAZ_image" src="client/bazar/images/'.$GLOBALS['_BAZAR_']['image_logo'].'" border=0 alt="'.BAZ_TEXTE_IMG_ALTERNATIF.'" width="130" height="130" />'."\n";
|
222 |
$res .= '</div>'."\n";
|
222 |
$res .= '</div>'."\n";
|
223 |
}
|
223 |
}
|
Line 224... |
Line 224... |
224 |
|
224 |
|
225 |
$res .= '<div class="BAZ_description BAZ_description_'.$GLOBALS['_BAZAR_']['class'].'">'.nl2br($ligne['bf_description']).'</div>'."\n";
|
225 |
$res .= '<div class="BAZ_description BAZ_description_'.$GLOBALS['_BAZAR_']['class'].'">'.nl2br(htmlentities($ligne['bf_description'])).'</div>'."\n";
|
Line 226... |
Line 226... |
226 |
$tableau=baz_valeurs_template($GLOBALS['_BAZAR_']['template']);
|
226 |
$tableau=baz_valeurs_template($GLOBALS['_BAZAR_']['template']);
|
227 |
|
227 |
|
228 |
/** Boucle d affichage des resultats
|
228 |
/** Boucle d affichage des resultats
|
Line 233... |
Line 233... |
233 |
// de ne pas renvoyer la carte lors de l affichage d une fiche (par exemple dans les fiches du calendrier)
|
233 |
// de ne pas renvoyer la carte lors de l affichage d une fiche (par exemple dans les fiches du calendrier)
|
234 |
$danslappli == 1 ? $GLOBALS['pas_de_carte'] = 0 : $GLOBALS['pas_de_carte'] = 1;
|
234 |
$danslappli == 1 ? $GLOBALS['pas_de_carte'] = 0 : $GLOBALS['pas_de_carte'] = 1;
|
235 |
for ($i=0; $i < count($tableau); $i++) {
|
235 |
for ($i=0; $i < count($tableau); $i++) {
|
236 |
if (isset($ligne[$tableau[$i]['nom_bdd']])) {
|
236 |
if (isset($ligne[$tableau[$i]['nom_bdd']])) {
|
237 |
$type = $tableau[$i]['type'];
|
237 |
$type = $tableau[$i]['type'];
|
238 |
$valeur = $ligne[$tableau[$i]['nom_bdd']];
|
238 |
$valeur = htmlentities($ligne[$tableau[$i]['nom_bdd']]);
|
Line 239... |
Line 239... |
239 |
|
239 |
|
240 |
} else {
|
240 |
} else {
|
241 |
$type = $tableau[$i]['type'];
|
241 |
$type = $tableau[$i]['type'];
|
242 |
$valeur = '';
|
242 |
$valeur = '';
|
Line 489... |
Line 489... |
489 |
// Nettoyage de l'url avant les return : apparement inutile sinon pose pb dans Papyrus (url applette deconnexion et moteur de recherche) [jpm le 17 mars 2008]
|
489 |
// Nettoyage de l'url avant les return : apparement inutile sinon pose pb dans Papyrus (url applette deconnexion et moteur de recherche) [jpm le 17 mars 2008]
|
490 |
//$GLOBALS['_BAZAR_']['url']->removeQueryString(BAZ_VARIABLE_ACTION);
|
490 |
//$GLOBALS['_BAZAR_']['url']->removeQueryString(BAZ_VARIABLE_ACTION);
|
491 |
//$GLOBALS['_BAZAR_']['url']->removeQueryString('id_fiche');
|
491 |
//$GLOBALS['_BAZAR_']['url']->removeQueryString('id_fiche');
|
492 |
$GLOBALS['_BAZAR_']['url']->removeQueryString('id_commentaire');
|
492 |
$GLOBALS['_BAZAR_']['url']->removeQueryString('id_commentaire');
|
493 |
$GLOBALS['_BAZAR_']['url']->removeQueryString('typeannonce');
|
493 |
$GLOBALS['_BAZAR_']['url']->removeQueryString('typeannonce');
|
- |
|
494 |
|
- |
|
495 |
|
- |
|
496 |
//return $res ;
|
- |
|
497 |
|
494 |
return $res ;
|
498 |
return $res ;
|
- |
|
499 |
|
- |
|
500 |
|
495 |
}
|
501 |
}
|
Line 496... |
Line 502... |
496 |
|
502 |
|
497 |
// merci PHP 5 ...
|
503 |
// merci PHP 5 ...
|
Line 1259... |
Line 1265... |
1259 |
|
1265 |
|
1260 |
return $res ;
|
1266 |
return $res ;
|
Line 1261... |
Line 1267... |
1261 |
}
|
1267 |
}
|
1262 |
|
1268 |
|
1263 |
function encoder_en_utf8($txt) {
|
- |
|
1264 |
// Nous remplaçons l'apostrophe de type RIGHT SINGLE QUOTATION MARK et les & isolées qui n'auraient pas été
|
1269 |
function encoder_en_utf8($txt) {
|
1265 |
// remplacées par une entitée HTML et les autres caractères incompatibles provenant de cp1252 sous Windows
|
- |
|
1266 |
$cp1252_map = array (
|
- |
|
1267 |
"\xc2\x80" => "\xe2\x82\xac", /* EURO SIGN */
|
- |
|
1268 |
"\xc2\x82" => "\xe2\x80\x9a", /* SINGLE LOW-9 QUOTATION MARK */
|
- |
|
1269 |
"\xc2\x83" => "\xc6\x92", /* LATIN SMALL LETTER F WITH HOOK */
|
- |
|
1270 |
"\xc2\x84" => "\xe2\x80\x9e", /* DOUBLE LOW-9 QUOTATION MARK */
|
- |
|
1271 |
"\xc2\x85" => "\xe2\x80\xa6", /* HORIZONTAL ELLIPSIS */
|
- |
|
1272 |
"\xc2\x86" => "\xe2\x80\xa0", /* DAGGER */
|
- |
|
1273 |
"\xc2\x87" => "\xe2\x80\xa1", /* DOUBLE DAGGER */
|
- |
|
1274 |
"\xc2\x88" => "\xcb\x86", /* MODIFIER LETTER CIRCUMFLEX ACCENT */
|
- |
|
1275 |
"\xc2\x89" => "\xe2\x80\xb0", /* PER MILLE SIGN */
|
- |
|
1276 |
"\xc2\x8a" => "\xc5\xa0", /* LATIN CAPITAL LETTER S WITH CARON */
|
- |
|
1277 |
"\xc2\x8b" => "\xe2\x80\xb9", /* SINGLE LEFT-POINTING ANGLE QUOTATION */
|
- |
|
1278 |
"\xc2\x8c" => "\xc5\x92", /* LATIN CAPITAL LIGATURE OE */
|
- |
|
1279 |
"\xc2\x8e" => "\xc5\xbd", /* LATIN CAPITAL LETTER Z WITH CARON */
|
1270 |
// Nous rempla�ons l'apostrophe de type RIGHT SINGLE QUOTATION MARK et les & isol�es qui n'auraient pas �t�
|
1280 |
"\xc2\x91" => "\xe2\x80\x98", /* LEFT SINGLE QUOTATION MARK */
|
- |
|
1281 |
"\xc2\x92" => "\xe2\x80\x99", /* RIGHT SINGLE QUOTATION MARK */
|
- |
|
1282 |
"\xc2\x93" => "\xe2\x80\x9c", /* LEFT DOUBLE QUOTATION MARK */
|
- |
|
1283 |
"\xc2\x94" => "\xe2\x80\x9d", /* RIGHT DOUBLE QUOTATION MARK */
|
- |
|
1284 |
"\xc2\x95" => "\xe2\x80\xa2", /* BULLET */
|
- |
|
1285 |
"\xc2\x96" => "\xe2\x80\x93", /* EN DASH */
|
- |
|
1286 |
"\xc2\x97" => "\xe2\x80\x94", /* EM DASH */
|
- |
|
1287 |
"\xc2\x98" => "\xcb\x9c", /* SMALL TILDE */
|
- |
|
1288 |
"\xc2\x99" => "\xe2\x84\xa2", /* TRADE MARK SIGN */
|
- |
|
1289 |
"\xc2\x9a" => "\xc5\xa1", /* LATIN SMALL LETTER S WITH CARON */
|
- |
|
1290 |
"\xc2\x9b" => "\xe2\x80\xba", /* SINGLE RIGHT-POINTING ANGLE QUOTATION*/
|
- |
|
1291 |
"\xc2\x9c" => "\xc5\x93", /* LATIN SMALL LIGATURE OE */
|
- |
|
1292 |
"\xc2\x9e" => "\xc5\xbe", /* LATIN SMALL LETTER Z WITH CARON */
|
- |
|
1293 |
"\xc2\x9f" => "\xc5\xb8" /* LATIN CAPITAL LETTER Y WITH DIAERESIS*/
|
- |
|
1294 |
);
|
1271 |
// remplac�es par une entit�e HTML.
|
1295 |
|
- |
|
1296 |
//return strtr(preg_replace('/ \x{0026} /u', ' & ', mb_convert_encoding($txt, 'UTF-8','HTML-ENTITIES')), $cp1252_map);
|
- |
|
1297 |
return strtr(preg_replace('/ \x{0026} /u', ' & ', utf8_encode($txt)), $cp1252_map);
|
1272 |
$cp1252_map = array("\xc2\x92" => "\xe2\x80\x99" /* RIGHT SINGLE QUOTATION MARK */);
|
Line 1298... |
Line 1273... |
1298 |
|
1273 |
return strtr(preg_replace('/ \x{0026} /u', ' & ', mb_convert_encoding($txt, 'UTF-8','HTML-ENTITIES')), $cp1252_map);
|
1299 |
}
|
1274 |
}
|
1300 |
|
1275 |
|