"valider et répondre" sur les forums modérés (CG)

ecrire/controle_forum.php3

@@ -172,7 +172,6 @@ function controle_forum($row, $rappel) {
 		  controle_cache_forum('supp_forum',
 				       $id_forum,
 				       _T('icone_supprimer_message'), 
-				       "controle_forum.php3?$rappel#$id_forum",
 				       $logo,
 				       "supprimer.gif");
 		else if ($forum_stat == "prive" OR $forum_stat == "privrac" OR $forum_stat == "privadm")
@@ -180,7 +179,6 @@ function controle_forum($row, $rappel) {
 		  controle_cache_forum('supp_forum_priv',
 				       $id_forum,
 				       _T('icone_supprimer_message'), 
-				       "controle_forum.php3?$rappel#$id_forum",
 				       $logo,
 				       "supprimer.gif");
 		    }
@@ -192,24 +190,22 @@ function controle_forum($row, $rappel) {
 
 	if ($forum_stat=="prop")
 	  {
-		$appelant= "forum.php3?$type=$valeur&id_forum=$id_forum";
+		$redirect = "../forum.php3?$type=$valeur&id_forum=$id_forum";
+
 		$controle .=
 		  controle_cache_forum('valid_forum',
 				       $id_forum,
 				       _T('icone_valider_message'), 
-				       "controle_forum.php3?$rappel&#$id_forum",
 				       $logo,
 				       "creer.gif") .
 		  controle_cache_forum('valid_forum',
 				       $id_forum,
 				       _T('icone_valider_message') . " & " .
-				       _T('lien_repondre_message'),
-				       "../$appelant&url=" .
-				       rawurlencode($appelant) . 
-				       "&retour=" .
-				       rawurlencode(_DIR_RESTREINT_ABS . "controle_forum.php3?$rappel&#$id_forum"), 
-				       _DIR_IMG_PACK . "messagerie-24.gif",
-				       "creer.gif");
+			           _T('lien_repondre_message'),
+				       $logo,
+				       "creer.gif",
+				       $redirect
+				       );
 	  }
 	$controle .= "<br />$avant<B>$pref <A HREF='$url'>$titre</A></B>" .
 	  "<P align='justify'>".propre($forum_texte);

ecrire/inc.php3

@@ -228,6 +228,9 @@ if ($controle_forum AND $id_controle_forum) {
 				changer_statut_forum($id_controle_forum, 'publie');
 				break;
 		}
+
+		if ($redirect)
+			redirige_par_entete($redirect);
 	}
 }
 

ecrire/inc_forum.php3

@@ -56,11 +56,16 @@ function changer_statut_forum($id_forum, $statut) {
 }
 
 // Installer un bouton de moderation (securise) dans l'espace prive
-function controle_cache_forum($action, $id, $texte, $lien, $fond, $fonction) {
+function controle_cache_forum($action, $id, $texte, $fond, $fonction, $redirect='') {
 	$link = $GLOBALS['clean_link'];
+
 	$link->addvar('controle_forum', $action);
 	$link->addvar('id_controle_forum', $id);
 	$link->addvar('hash', calculer_action_auteur("$action$id"));
+
+	if ($redirect)
+		$link->addvar('redirect', $redirect);
+
 	return icone($texte,
 		$link->geturl(),
 		$fond,