diff --git a/ecrire/action/instituer_forum.php b/ecrire/action/instituer_forum.php index 610af7b39ef57808d93f2f8e91d4d727c4e5b204..bd65e6f95405c2c90cb2187b6d30d6713b218736 100644 --- a/ecrire/action/instituer_forum.php +++ b/ecrire/action/instituer_forum.php @@ -36,9 +36,10 @@ function action_instituer_forum_dist() { // changer le statut de toute l'arborescence dependant de ce message $id_messages = array($id_forum); + $old = $row['statut']; while ($id_messages) { $id_messages = join(',', $id_messages); - spip_query("UPDATE spip_forum SET statut='$statut' WHERE id_forum IN ($id_messages)"); + spip_query("UPDATE spip_forum SET statut='$statut' WHERE id_forum IN ($id_messages) AND statut = '$old'"); $result_forum = spip_query("SELECT id_forum FROM spip_forum WHERE id_parent IN ($id_messages)"); $id_messages = array(); diff --git a/ecrire/inc/forum.php b/ecrire/inc/forum.php index 2719f38d12882b46461b3ac3e919a4b0b2705a2e..92ef08f4ab96c56df84755b3b9ced786281fa836 100644 --- a/ecrire/inc/forum.php +++ b/ecrire/inc/forum.php @@ -111,6 +111,11 @@ function boutons_controle_forum($id_forum, $forum_stat, $forum_id_auteur=0, $ref $valider_repondre = true; $suppression = 'off'; break; + # forum original (reponse a un forum modifie) sur le site public + case "original": + $logo = "forum-public-24.gif"; + $original = true; + break; default: return; } @@ -133,6 +138,14 @@ function boutons_controle_forum($id_forum, $forum_stat, $forum_id_auteur=0, $ref "creer.gif", 'right', 'non'); } + // TODO: un bouton retablir l'original ? + if ($original) { + $controle .= "<div style='float:".$GLOBALS['spip_lang_right'].";color:green'>" + ."(" + ._L('original') + .")</div>"; + } + return $controle; } diff --git a/ecrire/inc/presentation.php b/ecrire/inc/presentation.php index c94294ebb9bd5d9ed6c45c0bc018b660c1180a7d..48bd15ca2325baa38c0df2fa55327820834675f4 100644 --- a/ecrire/inc/presentation.php +++ b/ecrire/inc/presentation.php @@ -1130,7 +1130,11 @@ function afficher_forum_thread($row, $controle_id_article, $compteur_forum, $nb_ else if ($statut=="prop") { $res .= "\n<div style='border: 1px solid yellow; padding: 5px;'>"; } - + // Si original, cadre vert + else if ($statut=="original") { + $res .= "\n<div style='border: 1px solid green; padding: 5px;'>"; + } + $res .= "<span class='arial2'>". date_interface($date_heure) . "</span> "; if ($id_auteur) {