X-Git-Url: http://git.cyclocoop.org/?p=velocampus%2Fweb%2Fwww.git;a=blobdiff_plain;f=www%2Fecrire%2Fexec%2Faide_index.php;fp=www%2Fecrire%2Fexec%2Faide_index.php;h=57f6fb762d7b27f8e1e05fe51775594e8e37e0f4;hp=1e7b5d04f42e2a91636b9717ba5f77bf33e6aead;hb=e99f0878011913365e49b30d90e496c24c301393;hpb=80b4d3e85f78d402ed2e73f8f5d1bf4c19962eed

diff --git a/www/ecrire/exec/aide_index.php b/www/ecrire/exec/aide_index.php
index 1e7b5d0..57f6fb7 100644
--- a/www/ecrire/exec/aide_index.php
+++ b/www/ecrire/exec/aide_index.php
@@ -3,7 +3,7 @@
 /***************************************************************************\
  *  SPIP, Systeme de publication pour l'internet                           *
  *                                                                         *
- *  Copyright (c) 2001-2010                                                *
+ *  Copyright (c) 2001-2014                                                *
  *  Arnaud Martin, Antoine Pitrou, Philippe Riviere, Emmanuel Saint-James  *
  *                                                                         *
  *  Ce programme est un logiciel libre distribue sous licence GNU/GPL.     *
@@ -172,7 +172,7 @@ function help_body($aide) {
 function help_section($aide, $contenu, $prof=2)
 {
 	$maxprof = ($prof >=2) ? "12" : "1";
-	$r = "@<h$prof" . '(?: class="spip")?' . '>\s*' . $aide 
+	$r = "@<h$prof" . '(?: class="spip")?' . '>\s*' . preg_quote($aide) 
 	  ."\s*(?:/.+?)?</h$prof>(.*?)<(?:(?:h[$maxprof])|/body)@ism";
 
 	if (preg_match($r, $contenu, $m))
@@ -305,11 +305,12 @@ function exec_aide_index_dist()
 	global $help_server;
 	if (!is_array($help_server)) $help_server = array($help_server);
 	if (!preg_match(_HELP_PLACE_IMG,  _request('img'), $r)) {
-		aide_index_frame(_request('var_lang_r'),
-				 _request('lang_r'),
-				 _request('frame'),
-				 strtr(_request('aide'),'<>"\'', '____'),
-				 $help_server);
+		aide_index_frame(
+				preg_replace(',[^\w-]+,', '', _request('var_lang_r')),
+				preg_replace(',[^\w-]+,', '', _request('lang_r')),
+				_request('frame'),
+				strtr(_request('aide'),'<>"\'', '____'),
+				$help_server);
 	} else {
 		list (,$server, $cache, $rep, $lang, $file, $ext) = $r;
 		if ($rep=="IMG" AND $lang=="cache"