From a2f49071493591ea0f15ae796ed7bbfbbf757af0 Mon Sep 17 00:00:00 2001
From: Fil <fil@rezo.net>
Date: Fri, 4 Feb 2005 09:43:54 +0000
Subject: [PATCH] =?UTF-8?q?bug=20mod=C3=A9ration=20des=20forums?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 inc-messforum.php3 | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/inc-messforum.php3 b/inc-messforum.php3
index 38b7b0b925..e51deab24d 100644
--- a/inc-messforum.php3
+++ b/inc-messforum.php3
@@ -47,20 +47,21 @@ function prevenir_auteurs($auteur, $email_auteur, $id_article, $texte, $titre) {
 }
 
 
-function controler_forum($id_article, $retour)
-{
+function controler_forum($id_article, $retour) {
 	global $auteur_session;
+
+	// Reglage forums d'article
 	if ($id_article) {
-		$r = spip_query("SELECT accepter_forum FROM spip_articles WHERE id_article=$id_article");
-		$r = spip_fetch_array($r);
-		if ($r)
+		$q = spip_query("SELECT accepter_forum FROM spip_articles
+			WHERE id_article=$id_article");
+		if ($r = spip_fetch_array($q))
 			$forums_publics = $r['accepter_forum'];
-		else
-			$forums_publics = lire_meta("forums_publics");
-	} else {
-		$forums_publics = substr(lire_meta("forums_publics"),0,3);
 	}
 
+	// Valeur par defaut
+	if (!$forums_publics)
+		$forums_publics = substr(lire_meta("forums_publics"),0,3);
+
 	if ($forums_publics == "abo") {
 		if ($auteur_session) {
 			$statut = $auteur_session['statut'];
@@ -74,9 +75,10 @@ function controler_forum($id_article, $retour)
 			ask_php_auth(_T('forum_non_inscrit'),
 				     _T('forum_cliquer_retour',
 					array('retour_forum' => $retour)));
-			exit;		  
+			exit;
 		}
 	}
+
 	return $forums_publics;
 }
 
@@ -107,7 +109,7 @@ function enregistre_forum()
 	if (!$id_auteur)
 	$id_auteur = intval($auteur_session['id_auteur']);
 
-	$statut == controler_forum($id_article, $retour_forum);
+	$statut = controler_forum($id_article, $retour_forum);
 
 // Ne pas autoriser de changement de nom si forum sur abonnement
 
-- 
GitLab