No commit message

No commit message

ecrire/exec/articles_tous.php

@@ -248,12 +248,7 @@ function afficher_rubriques_filles($id_parent) {
 	global $enfant, $article;
 	global $spip_lang_left, $spip_lang_right, $spip_lang;
 	global $couleur_claire;
-	global $browser_name;
 	static $decal = 0;
-	if ($browser_name=="MSIE")
-		$wrapper = file_exists($w = _DIR_IMG_PACK ."wrapper.php");
-	else
-		$wrapper = false;
 
 	$decal = $decal + 1;
 	$droite = 500 - (10 * $decal);
@@ -269,10 +264,8 @@ function afficher_rubriques_filles($id_parent) {
 				$icone = "rubrique-24.gif";
 				$bgcolor = "";
 			}
-			if ($wrapper)
-				$icone = "wrapper.php?file=".urlencode($icone);
 			
-			echo "<div style='padding-top: 5px; padding-bottom: 5px; padding-$spip_lang_left: 28px; background: url(" . _DIR_IMG_PACK . "$icone) $spip_lang_left center no-repeat;$bgcolor'>";
+			echo "<div style='padding-top: 5px; padding-bottom: 5px; padding-$spip_lang_left: 28px; background: url(" . http_wrapper($icone) . ") $spip_lang_left center no-repeat;$bgcolor'>";
 			
 			$lesarticles = isset($article[$id_rubrique]) ? $article[$id_rubrique] : '';
 			$lesenfants = isset($enfant[$id_rubrique]) ? $enfant[$id_rubrique] : '';

ecrire/exec/js_menu_rubriques.php

@@ -102,15 +102,8 @@ function bandeau_rubrique($id_rubrique, $titre_rubrique, $z = 1) {
 	//else $image = "rubrique-12.gif";
 	else $image = '';
 	
-	if (strlen($image) > 1) {
-		global $browser_name;
-		include_spip('inc/layer');
-		verif_butineur();
-		if ($browser_name=="MSIE" && file_exists($w = dirname(_DIR_IMG_PACK.$image)."/wrapper.php"))
-	  	$image = " style='background-image:url($w?file=".urlencode($image) .  ");'";
-		else
-			$image = " style='background-image:url(" . _DIR_IMG_PACK . $image .");'";
-	}
+	if (strlen($image) > 1)
+		$image = " style='background-image:url(" . http_wrapper($image) .");'";
 
 	$arr_rub = extraire_article($id_rubrique);
 

ecrire/inc/layer.php

@@ -92,16 +92,12 @@ function bouton_block_visible($nom_block){
 
 function produire_acceder_couche($couches, $nom, $icone) {
 	global $spip_lang_rtl;
-	global $browser_name;
-	$f = _DIR_IMG_PACK.$icone;
-	if ($browser_name=="MSIE" && file_exists($w = dirname($f)."/wrapper.php"))
-		$icone = "wrapper.php?file=".urlencode($icone);
 	return http_script("acceder_couche([" . join(',',$couches) . '], ' .
 			   $nom .
 			   ", '" .
 			   _DIR_IMG_PACK .
 			   "', '" .
-			   $icone .
+			   substr(http_wrapper($icone),strlen(_DIR_IMG_PACK)) .
 			   "', '" .
 			   addslashes(_T('info_deplier')) .
 			   "','$spip_lang_rtl')");

ecrire/inc/minipres.php

@@ -165,15 +165,30 @@ function http_href($href, $clic, $title='', $style='', $class='', $evt='') {
 // produit une balise img avec un champ alt d'office si vide
 // attention le htmlentities et la traduction doivent etre appliques avant.
 
-function http_img_pack($img, $alt, $att, $title='') {
-	global $browser_name;
-	if (!strlen($browser_name)){
-		include_spip('inc/layer');
+function http_wrapper($img){
+	static $wrapper_state=NULL;
+	static $wrapper_table = array();
+	
+	$f = _DIR_IMG_PACK . $img;
+	
+	if ($wrapper_state==NULL){
+		global $browser_name;
+		if (!strlen($browser_name)){include_spip('inc/layer');}
+		$wrapper_state = ($browser_name=="MSIE");
+	}
+	if ($wrapper_state){
+		if (!isset($wrapper_table[$d=dirname($f)])) {
+			$wrapper_table[$d] = false;
+			if (file_exists("$d/wrapper.php"))
+				$wrapper_table[$d] = "$d/wrapper.php?file=";
+		}
+		if ($wrapper_table[$d])
+			$f = $wrapper_table[$d] . urlencode($img);
 	}
-	$f = _DIR_IMG_PACK.$img;
-	if ($browser_name=="MSIE" && file_exists($w = dirname($f)."/wrapper.php"))
-		$f = "$w?file=".urlencode($img);
-	return "<img src='" . $f
+	return $f;
+}
+function http_img_pack($img, $alt, $att, $title='') {
+	return "<img src='" . http_wrapper($img)
 	  . ("'\nalt=\"" .
 	     ($alt ? str_replace('"','',$alt) : ($title ? $title : ereg_replace('\..*$','',$img)))
 	     . '" ')
@@ -188,14 +203,7 @@ function http_href_img($href, $img, $att, $title='', $style='', $class='', $evt=
 
 function http_style_background($img, $att='')
 {
-	global $browser_name;
-	if (!strlen($browser_name)){
-		include_spip('inc/layer');
-	}
-	$f = _DIR_IMG_PACK.$img;
-	if ($browser_name=="MSIE" && file_exists($w = dirname($f)."/wrapper.php"))
-		$f = "$w?file=".urlencode($img);
-  return " style='background: url(\"$f\")" .
+  return " style='background: url(\"".http_wrapper($img)."\")" .
 	    ($att ? (' ' . $att) : '') . ";'";
 }