Subversion Repositories Sites.outils-naturalistes.fr

Rev

Rev 25 | Rev 30 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 25 Rev 26
Line 241... Line 241...
241
				$type = $tableau[$i]['type'];
241
				$type = $tableau[$i]['type'];
242
				$valeur = '';
242
				$valeur = '';
243
			}
243
			}
Line 244... Line 244...
244
			
244
			
245
			$element = Bazar_element::factory($type, $tableau[$i]);
245
			$element = Bazar_element::factory($type, $tableau[$i]);
246
			if (!PEAR::isError($element)) {
246
			if (!PEAR::isError($element) /*&& strlen($valeur) != 0*/) {
247
				$res .= $element->toHTML($valeur);
247
				$res .= $element->toHTML($valeur);
Line 248... Line 248...
248
			} else {
248
			} else {
249
 
249
 
Line 1259... Line 1259...
1259
 
1259
 
1260
	return $res ;
1260
	return $res ;
Line 1261... Line 1261...
1261
}
1261
}
1262
 
1262
 
-
 
1263
function encoder_en_utf8($txt) {
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é 
-
 
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 */
1264
	// Nous rempla�ons l'apostrophe de type RIGHT SINGLE QUOTATION MARK et les & isol�es qui n'auraient pas �t� 
1279
            "\xc2\x8e" => "\xc5\xbd",     /* LATIN CAPITAL LETTER Z WITH CARON */
-
 
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*/            
1265
	// remplac�es par une entit�e HTML.
1294
        );
-
 
1295
 
-
 
1296
    //return  strtr(preg_replace('/ \x{0026} /u', ' & ', mb_convert_encoding($txt, 'UTF-8','HTML-ENTITIES')), $cp1252_map);
1266
	$cp1252_map = array("\xc2\x92" => "\xe2\x80\x99" /* RIGHT SINGLE QUOTATION MARK */);
1297
    return strtr(preg_replace('/ \x{0026} /u', ' & ', utf8_encode($txt)), $cp1252_map);
Line 1267... Line 1298...
1267
	return  strtr(preg_replace('/ \x{0026} /u', ' & ', mb_convert_encoding($txt, 'UTF-8','HTML-ENTITIES')), $cp1252_map);
1298
 
1268
}
1299
}
1269
 
1300