Suite de [8174]: accepter aussi '-' dans un ID, et petites améliorations.

ecrire/exec/recherche.php

@@ -33,10 +33,10 @@ function exec_recherche_dist()
 	  $recherche_aff = _T('info_rechercher');
 	  $onfocus = "this.value='';";
 	}
-	echo "<form method='get' style='margin: 0px;' action='" . generer_url_ecrire("recherche","") . "'>";
+	echo "<form method='get' style='margin: 0px;' action='" . generer_url_ecrire("recherche","") . "'><div>";
 	echo "<input type='hidden' name='exec' value='recherche' />";
 	echo '<input type="text" size="10" value="'.$recherche_aff.'" name="recherche" class="spip_recherche" accesskey="r" onfocus="'.$onfocus . '" />';
-	echo "</form>";
+	echo "</div></form>";
 
 	debut_droite();
 
@@ -127,7 +127,7 @@ function exec_recherche_dist()
 	}
 	
 	if (!$nba AND !$nba1 AND !$nbb AND !$nbb1 AND !$nbr AND !$nbr1 AND !$nbt AND !$nbs AND !$nbs1) {
-		echo "<font face='Verdana,Arial,Sans,sans-serif'>"._T('avis_aucun_resultat')."</font><p>";
+		echo "<p style='font-face: Verdana,Arial,Sans,sans-serif'>"._T('avis_aucun_resultat')."</p>";
 	}
 	}
 echo fin_gauche(), fin_page();

ecrire/inc/gadgets.php

@@ -322,12 +322,12 @@ onmouseover=\"findObj_forcer('bandeautoutsite').style.visibility='visible'; char
 	$bandeau .= "\n<div id='bandeaurecherche' class='bandeau bandeau_couleur_sous' style='$spip_lang_left: 60px;'>"
 	. "<form method='get' style='margin: 0px; position: relative;' action='"
 	 . generer_url_ecrire("recherche")
-	. "'>"
+	. "'><div>"
 	. "<input type='hidden' name='exec' value='recherche' />"
 	. "<input type=\"text\" id=\"form_recherche\" style=\"width: 140px;\" size=\"10\" value=\""
 	. _T('info_rechercher')
 	. "\" name=\"recherche\" onkeypress=\"$js;t=window.setTimeout('lancer_recherche(\'form_recherche\',\'resultats_recherche\')', 200);\" class=\"formo\" accesskey=\"r\" />"
-	. "</form>"
+	. "</div></form>"
 	. "</div>";
 	// FIN GADGET recherche
 

ecrire/inc/lang.php

@@ -158,10 +158,10 @@ function menu_langues($nom_select = 'var_lang', $default = '', $texte = '', $her
 	     : "<noscript><input type='submit' class='fondo' value='". _T('bouton_changer')."' /></noscript>");
 
 	if ($lien === 'ajax') return $ret;
-	return "<form action='$lien' method='post' style='margin:0px; padding:0px;'>"
+	return "\n<form action='$lien' method='post' style='margin:0px; padding:0px;'>\n<div>"
 	  . (!$cible ? '' : "<input type='hidden' name='url' value='$cible' />")
 	  . $ret
-	  . "</form>\n";
+	  . "</div></form>\n";
 }
 
 // http://doc.spip.org/@liste_options_langues

ecrire/inc/valider_xml.php

@@ -17,7 +17,7 @@ include_spip('inc/sax');
 define('_REGEXP_DOCTYPE',
 	'/^\s*(<[?][^>]*>\s*)?<!DOCTYPE\s+(\w+)\s+(\w+)\s*([^>]*)>/');
 
-define('_REGEXP_ID', '/^[A-Za-z_][\w_:.]*$/');
+define('_REGEXP_ID', '/^[A-Za-z_][\w_:.-]*$/');
 
 // http://doc.spip.org/@validateur
 function validateur($data)