From dddf1b83522abb399ee5513bf88edd34c1c630d4 Mon Sep 17 00:00:00 2001
From: cy_altern <cy.altern@gmail.com>
Date: Wed, 2 Jul 2025 13:16:09 +0200
Subject: [PATCH] Feat : Gamutable des messages : ajout de l'action de
 changement de statut

---
 action/changer_statut_message.php | 23 +++++++++++++++
 base/gamucontact.php              |  2 +-
 gamucontact_administrations.php   |  3 ++
 inclure/inc_messages.html         |  2 +-
 json_messages.json.html           | 49 ++++++++++++++-----------------
 lang/gamucontact_en.php           |  1 +
 lang/gamucontact_fr.php           |  1 +
 paquet.xml                        |  4 +--
 8 files changed, 54 insertions(+), 31 deletions(-)
 create mode 100644 action/changer_statut_message.php

diff --git a/action/changer_statut_message.php b/action/changer_statut_message.php
new file mode 100644
index 0000000..e51682d
--- /dev/null
+++ b/action/changer_statut_message.php
@@ -0,0 +1,23 @@
+<?php
+if (!defined('_ECRIRE_INC_VERSION')) return;
+
+function action_changer_statut_message_dist(){
+	include_spip('inc/autoriser');
+	if (!autoriser("modifier","message")) {
+		return false;
+	}
+
+	$securiser_action = charger_fonction('securiser_action', 'inc');
+	$args = $securiser_action();
+
+	list($id_message, $statut) = explode('-', $args);
+	if (!intval($id_message) || !in_array($statut, ['prepa', 'prop', 'publie', 'poubelle'])) {
+		return false;
+	}
+
+	sql_updateq('spip_messages', ['statut' => $statut], ['id_message=' . $id_message]);
+
+	// Cache
+	include_spip('inc/invalideur');
+	suivre_invalideur("id='messages/$id_message'");
+}
diff --git a/base/gamucontact.php b/base/gamucontact.php
index 6fcbc96..6a0552c 100644
--- a/base/gamucontact.php
+++ b/base/gamucontact.php
@@ -43,7 +43,7 @@ function gamucontact_declarer_tables_objets_sql($tables) {
 			'date_heure'    => "datetime NOT NULL DEFAULT '0000-00-00 00:00:00'",
 			'date_fin'      => "datetime NOT NULL DEFAULT '0000-00-00 00:00:00'",
 			'rv'            => "varchar(3) NOT NULL DEFAULT ''",
-			'statut'        => "varchar(6) NOT NULL DEFAULT '0'",
+			'statut'        => "varchar(10) NOT NULL DEFAULT '0'",
 			'id_auteur'     => "bigint(21) NOT NULL DEFAULT '0'",
 			'destinataires' => 'text NOT NULL',
 			'ip'            => "varchar(50) NOT NULL DEFAULT '0'",
diff --git a/gamucontact_administrations.php b/gamucontact_administrations.php
index ca0523e..ee8113d 100644
--- a/gamucontact_administrations.php
+++ b/gamucontact_administrations.php
@@ -30,6 +30,9 @@ function gamucontact_upgrade($nom_meta_base_version, $version_cible) {
 	$maj['1.0.5'] = array(array('maj_tables', array('spip_messages')));
 	$maj['1.0.6'] = array(array('maj_tables', array('spip_messages')));
 	$maj['1.0.7'] = array(array('maj_tables', array('spip_messages')));
+	$maj['1.0.8'] = array(
+		array('sql_alter', "TABLE spip_messages CHANGE statut statut VARCHAR(10) NOT NULL DEFAULT '0'"),
+	); 
 
 	include_spip('base/upgrade');
 	maj_plugin($nom_meta_base_version, $version_cible, $maj);
diff --git a/inclure/inc_messages.html b/inclure/inc_messages.html
index 2166ba4..31e841b 100644
--- a/inclure/inc_messages.html
+++ b/inclure/inc_messages.html
@@ -1,7 +1,7 @@
 [(#AUTORISER{voir,messages}|sinon_interdire_acces)]
 
 #SET{url,#URL_PAGE{json_messages.json}}
-[(#SET{titre_un,<i class="fa fa-send"></i> Messages envoyés sur le site})]
+[(#SET{titre_un, <i class="fa fa-send"></i> <:gamucontact:messages_envoyes_site:>})]
 <div class="">
 	<div class="gamucontact-gamutable">
 		<INCLURE{fond=inclure/gamutable,
diff --git a/json_messages.json.html b/json_messages.json.html
index a7720e0..520a700 100644
--- a/json_messages.json.html
+++ b/json_messages.json.html
@@ -13,6 +13,7 @@
 		]
 		"objet": "Objet",
 		"statut": "Statut",
+		"actions": "Actions",
 		"nom": "Expéditeur",
 		"email_contact": "Email",
 		"telephone": "Tel",
@@ -36,13 +37,11 @@
 		]
 		"email_contact" : "input"
 	},
-	"filtreColValeurs" : {
-		[(#REM) "statut": "prop" ]
-	},
+	"filtreColValeurs" : {},
 	"classes": {
 		"id": "w80p",
-		"objet": "minw150p",
-		"statut": "minw80p",
+		"objet": "minw250p",
+		"statut": "minw100p",
 		"formulaire": "w150p"
 	}
 }
@@ -55,28 +54,22 @@
 [(#SET{origine_, <a class="small nowrap" href="#ORIGINE" title="Accéder à la page d'origine du message">[(#ORIGINE|couper{35})...]</a>})]
 [(#SET{origine, article origine})]
 
-#SET{args,#ID_MESSAGE|concat{-}|concat{#STATUT}}
-[(#SET{statut, 
-<a
-  class="url_action"
-  data-id="#ID_MESSAGE"
-  href="[(#URL_ACTION_AUTEUR{changer_statut_message,#GET{args}})]"
->
-  [(#STATUT|!={publie}|oui)
-  <i
-    title="Publier le message"
-    class="fa fa-check fa-2x grise"
-    aria-hidden="true"
-  ></i>
-  ] [(#STATUT|=={publie}|oui)
-  <i
-    title="Passer à la poubelle le message"
-    class="fa fa-trash fa-2x rouge"
-    aria-hidden="true"
-  ></i>
-  ]
-</a>
-})]
+#SET{args,#ID_MESSAGE}
+[(#STATUT|!={publie}|oui)
+	#SET{args, #GET{args}|concat{-}|concat{publie}}
+	[(#SET{actions, 
+		<a class="url_action" data-id="#ID_MESSAGE" href="[(#URL_ACTION_AUTEUR{changer_statut_message,#GET{args}})]">
+			<i title="Publier le message" class="fa fa-check fa-2x grise" aria-hidden="true"></i>
+		</a>
+	})]
+][(#STATUT|=={publie}|oui) 
+	#SET{args, #GET{args}|concat{-}|concat{poubelle}}
+	[(#SET{actions, 
+		<a class="url_action" data-id="#ID_MESSAGE" href="[(#URL_ACTION_AUTEUR{changer_statut_message,#GET{args}})]">
+			<i title="Passer à la poubelle le message" class="fa fa-trash fa-2x rouge" aria-hidden="true"></i>
+		</a>
+	})]
+]
 
 {
 "html": {
@@ -89,6 +82,7 @@
 	]
 	"objet": [(#OBJET|json_encode)],
 	"statut": [(#GET{statut}|json_encode)],
+	"actions": [(#GET{actions}|json_encode)],
 	"nom": [(#NOM|json_encode)],
 	"email_contact": [(#EMAIL_CONTACT|json_encode)],
 	"telephone": [(#TELEPHONE|json_encode)],
@@ -104,6 +98,7 @@
 	]
 	"objet": [(#OBJET|json_encode)],
 	"statut": [(#STATUT|json_encode)],
+	"actions": "",
 	"nom": [(#NOM|json_encode)],
 	"email_contact": [(#EMAIL_CONTACT|json_encode)],
 	"telephone": [(#TELEPHONE|json_encode)],
diff --git a/lang/gamucontact_en.php b/lang/gamucontact_en.php
index eae4622..8c41b7a 100644
--- a/lang/gamucontact_en.php
+++ b/lang/gamucontact_en.php
@@ -26,6 +26,7 @@ $GLOBALS[$GLOBALS['idx_lang']] = array(
 
 	// M
 	'message' => 'Message',
+	'messages_envoyes_site' => 'Messages sent on the website',
 
 	// N
 	'nom' => 'Name',
diff --git a/lang/gamucontact_fr.php b/lang/gamucontact_fr.php
index 202e32c..e891528 100644
--- a/lang/gamucontact_fr.php
+++ b/lang/gamucontact_fr.php
@@ -26,6 +26,7 @@ $GLOBALS[$GLOBALS['idx_lang']] = array(
 
 	// M
 	'message' => 'Message',
+	'messages_envoyes_site' => 'Messages envoyés sur le site',
 
 	// N
 	'nom' => 'Nom',
diff --git a/paquet.xml b/paquet.xml
index 86764dd..565b583 100644
--- a/paquet.xml
+++ b/paquet.xml
@@ -1,12 +1,12 @@
 <paquet
 	prefix="gamucontact"
 	categorie="communication"
-	version="1.0.8"
+	version="1.0.9"
 	etat="test"
 	compatibilite="[3.2.10;4.*]"
 	logo="./gamucontact-xx.svg"
 	documentation=""
-	schema="1.0.7"
+	schema="1.0.8"
 >
 	<nom>GamuContact</nom>