From 7730aeda556ec140c5e18ff2d7ed90f9485f75a8 Mon Sep 17 00:00:00 2001
From: ARNO* <arno@rezo.net>
Date: Fri, 15 Oct 2004 19:05:59 +0000
Subject: [PATCH] Forums publics: inserer le thread immediatement sans calcul
global
---
article-dist.html | 4 ++--
ecrire/forum_envoi.php3 | 5 +++--
ecrire/inc_forum.php3 | 1 +
inc-messforum.php3 | 7 +++++--
4 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/article-dist.html b/article-dist.html
index 6ddbf150a2..09ad67584d 100644
--- a/article-dist.html
+++ b/article-dist.html
@@ -248,7 +248,7 @@
<div class="forum-chapo">
<div class="forum-titre"><a name="forum#ID_FORUM"></a>#TITRE</div>
[(#DATE|affdate)][, <:par_auteur:> <A HREF="mailto:#EMAIL">(#NOM)</A>]
-</div>
+</div>#ID_THREAD
<div class="forum-item">
#TEXTE
[<div class="forum-titre"><a href="(#URL_SITE)" class="spip_out">#NOM_SITE</a></div>]
@@ -265,7 +265,7 @@
<div class="forum-chapo">
<div class="forum-titre"><a name="forum#ID_FORUM"></a>#TITRE</div>
[(#DATE|affdate)][, <:par_auteur:> <A HREF="mailto:#EMAIL">(#NOM)</A>]
- </div>
+ </div>#ID_THREAD
<div class="forum-item">
#TEXTE
[<div class="forum-titre"><a href="(#URL_SITE)" class="spip_out">#NOM_SITE</a></div>]
diff --git a/ecrire/forum_envoi.php3 b/ecrire/forum_envoi.php3
index 915cb48a0e..532f0aa635 100644
--- a/ecrire/forum_envoi.php3
+++ b/ecrire/forum_envoi.php3
@@ -12,8 +12,9 @@ $adresse_retour = rawurldecode($adresse_retour);
if ($valider_forum AND ($statut!='')) {
$titre_message = addslashes(corriger_caracteres($titre_message));
$texte = addslashes(corriger_caracteres($texte));
- $query = "INSERT INTO spip_forum (titre, texte, date_heure, nom_site, url_site, statut, id_auteur, auteur, email_auteur, id_rubrique, id_parent, id_article, id_breve, id_message, id_syndic) ".
- "VALUES (\"$titre_message\", \"$texte\", NOW(), \"$nom_site\", \"$url_site\", \"$statut\", \"$connect_id_auteur\", \"$nom\", '$connect_email', '$id_rubrique', '$id_parent', '$id_article', '$id_breve', '$id_message', '$id_syndic')";
+ $query = "INSERT
+ INTO spip_forum (titre, texte, date_heure, nom_site, url_site, statut, id_auteur, auteur, email_auteur, id_rubrique, id_parent, id_article, id_breve, id_message, id_syndic) ".
+ "VALUES (\"$titre_message\", \"$texte\", NOW(), \"$nom_site\", \"$url_site\", \"$statut\", \"$connect_id_auteur\", \"$nom\", '$connect_email', '$id_rubrique', '$id_parent', '$id_article', '$id_breve', '$id_message', '$id_syndic')";
$result = spip_query($query);
calculer_threads();
diff --git a/ecrire/inc_forum.php3 b/ecrire/inc_forum.php3
index 8f44be32d3..884ecb9a83 100644
--- a/ecrire/inc_forum.php3
+++ b/ecrire/inc_forum.php3
@@ -100,4 +100,5 @@ function calculer_threads() {
} while ($discussion != "0");
}
+
?>
diff --git a/inc-messforum.php3 b/inc-messforum.php3
index 743744af41..215c05f802 100644
--- a/inc-messforum.php3
+++ b/inc-messforum.php3
@@ -90,12 +90,16 @@ $statut = ((!$validation_finale) ? 'redac' :
(($forums_publics == 'non') ? 'off' :
(($forums_publics == 'pri') ? 'prop' : 'publie')));
+if ($forum_id_forum > 0) $id_thread = $forum_id_forum;
+else $id_thread = $id_message;
+
spip_query("UPDATE spip_forum SET id_parent = $forum_id_parent,
id_rubrique =$forum_id_rubrique,
id_article = $forum_id_article,
id_breve = $forum_id_breve,
id_syndic = $forum_id_syndic,
id_auteur = $id_auteur,
+ id_thread = $id_thread,
date_heure = NOW(),
titre = \"$slash_titre\",
texte = \"$slash_texte\",
@@ -108,8 +112,7 @@ spip_query("UPDATE spip_forum SET id_parent = $forum_id_parent,
WHERE id_forum = '$id_message'
");
-calculer_threads();
-
+//calculer_threads();
if ($validation_finale) {
include_ecrire("inc_admin.php3");
--
GitLab