renommages de poster et editer_forum; le premier correspondant au reglage de...

renommages de poster et editer_forum; le premier correspondant au reglage de la moderation des forums de l'article; le second a l'insertion d'un forum prive

.gitattributes

@@ -308,7 +308,6 @@ ecrire/action/documenter.php -text
 ecrire/action/editer_article.php -text
 ecrire/action/editer_auteurs.php -text
 ecrire/action/editer_breve.php -text
-ecrire/action/editer_forum.php -text
 ecrire/action/editer_mot.php -text
 ecrire/action/editer_rubrique.php -text
 ecrire/action/editer_signatures.php -text
@@ -327,10 +326,11 @@ ecrire/action/legender.php -text
 ecrire/action/legender_auteur.php -text
 ecrire/action/logout.php -text
 ecrire/action/petitionner.php -text
-ecrire/action/poster.php -text
+ecrire/action/poster_forum_prive.php -text
 ecrire/action/purger.php -text
 ecrire/action/redirect.php -text
 ecrire/action/referencer_traduction.php -text
+ecrire/action/regler_moderation.php -text
 ecrire/action/supprimer.php -text
 ecrire/action/supprimer_traduction.php -text
 ecrire/action/test_dirs.php -text
@@ -411,11 +411,11 @@ ecrire/exec/mots_type.php -text
 ecrire/exec/naviguer.php -text
 ecrire/exec/petitionner.php -text
 ecrire/exec/plonger.php -text
-ecrire/exec/poster.php -text
 ecrire/exec/recherche.php -text
 ecrire/exec/rechercher.php -text
 ecrire/exec/rechercher_auteur.php -text
 ecrire/exec/referencer_traduction.php -text
+ecrire/exec/regler_moderation.php -text
 ecrire/exec/rubriquer.php -text
 ecrire/exec/rubriques_edit.php -text
 ecrire/exec/selectionner.php -text
@@ -474,8 +474,8 @@ ecrire/inc/petitionner.php -text
 ecrire/inc/plonger.php -text
 ecrire/inc/plugin.php -text
 ecrire/inc/popularites.php -text
-ecrire/inc/poster.php -text
 ecrire/inc/referencer_traduction.php -text
+ecrire/inc/regler_moderation.php -text
 ecrire/inc/selectionner.php -text
 ecrire/inc/selectionner_auteur.php -text
 ecrire/inc/sites_voir.php -text

ecrire/action/editer_forum.php → ecrire/action/poster_forum_prive.php

@@ -13,7 +13,7 @@
 if (!defined("_ECRIRE_INC_VERSION")) return;
 
 // http://doc.spip.org/@action_editer_mot_dist
-function action_editer_forum_dist() {
+function action_poster_forum_prive_dist() {
 
 	include_spip('inc/actions');
 	$var_f = charger_fonction('controler_action_auteur', 'inc');
@@ -22,12 +22,12 @@ function action_editer_forum_dist() {
 	$arg = _request('arg');
 	// arg = l'eventuel mot a supprimer pour d'eventuelles Row SQL
 	if (!preg_match(',^(\d+)\D(\d+)\D(\w+)\W(\w+)\W(\w+)$,', $arg, $r)) 
-		spip_log("action editer_forum: $arg pas compris");
-	else action_editer_forum_post($r);
+		spip_log("action poster_forum_prive: $arg pas compris");
+	else action_poster_forum_prive_post($r);
 }
 
 // http://doc.spip.org/@action_editer_mot_post
-function action_editer_forum_post($r)
+function action_poster_forum_prive_post($r)
 {
 	global $redirect, $nom_site, $texte, $titre_message, $url_site,  $modif_forum,  $valider_forum;
 
@@ -54,7 +54,7 @@ function action_editer_forum_post($r)
 		redirige_par_entete($redirect);
 		
 	 } else {
-	   // on ne fait que passer .... 
+	   // previsualisation : on ne fait que passer .... 
 	   // et si les clients HTTP respectaient le RFC HTTP selon lequel
 	   // une redirection d'un POST doit etre en POST et pas en GET
 	   // on n'aurait pas a faire l'horreur ci-dessous.

ecrire/action/poster.php → ecrire/action/regler_moderation.php

@@ -15,8 +15,8 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
 include_spip('inc/actions');
 
 // Modifier le reglage des forums publics de l'article x
-// http://doc.spip.org/@action_poster_dist
-function action_poster_dist()
+// http://doc.spip.org/@action_regler_moderation_dist
+function action_regler_moderation_dist()
 {
 	$var_f = charger_fonction('controler_action_auteur', 'inc');
 	$var_f();
@@ -24,12 +24,12 @@ function action_poster_dist()
 	$arg = _request('arg');
 
 	if (!preg_match(",^\W*(\d+)$,", $arg, $r)) {
-		 spip_log("action_poster_dist $arg pas compris");
-	} else action_poster_post($r);
+		 spip_log("action_regler_moderation_dist $arg pas compris");
+	} else action_regler_moderation_post($r);
 }
 
-// http://doc.spip.org/@action_poster_post
-function action_poster_post($r)
+// http://doc.spip.org/@action_regler_moderation_post
+function action_regler_moderation_post($r)
 {
 	$id_article = $r[1];
 	$statut = _request('change_accepter_forum');

ecrire/exec/articles.php

@@ -231,11 +231,11 @@ function boite_info_articles($id_article, $statut_article, $visites, $id_version
 // http://doc.spip.org/@boites_de_config_articles
 function boites_de_config_articles($id_article, $modifiable)
 {
-	$poster = charger_fonction('poster', 'inc');
+	$regler_moderation = charger_fonction('regler_moderation', 'inc');
 	$petitionner = charger_fonction('petitionner', 'inc');
-	$poster = $poster($id_article,"articles","id_article=$id_article", $modifiable);
+	$regler_moderation = $regler_moderation($id_article,"articles","id_article=$id_article", $modifiable);
 	$petitionner = $petitionner($id_article,"articles","id_article=$id_article",$modifiable);
-	$masque = $poster . $petitionner;
+	$masque = $regler_moderation . $petitionner;
 
 	if (!$masque) return '';
 

ecrire/exec/forum_envoi.php

@@ -160,7 +160,7 @@ function forum_envoi(
 
 	echo  $parent,
 	  "\n<div>&nbsp;</div>"
-	  . redirige_action_auteur('editer_forum',$cat, $script, "$objet=$id", $corps, "")
+	  . redirige_action_auteur('poster_forum_prive',$cat, $script, "$objet=$id", $corps, "")
 	  .  "<a id='formulaire'></a>"
 	  . fin_page();
 }

ecrire/exec/poster.php → ecrire/exec/regler_moderation.php

@@ -12,8 +12,8 @@
 
 if (!defined("_ECRIRE_INC_VERSION")) return;
 
-// http://doc.spip.org/@exec_poster_dist
-function exec_poster_dist()
+// http://doc.spip.org/@exec_regler_moderation_dist
+function exec_regler_moderation_dist()
 {
 	global $id_article, $script;
 	$id_article = intval($id_article);
@@ -24,7 +24,7 @@ function exec_poster_dist()
 		minipres(_T('info_acces_interdit'));
 	}
 
-	$poster = charger_fonction('poster', 'inc');
-	ajax_retour($poster($id_article, $script, "&id_article=$id_article", true));
+	$regler_moderation = charger_fonction('regler_moderation', 'inc');
+	ajax_retour($regler_moderation($id_article, $script, "&id_article=$id_article", true));
 }
 ?>

ecrire/inc/poster.php → ecrire/inc/regler_moderation.php

@@ -28,8 +28,9 @@ function get_forums_publics($id_article=0) {
 }
 
 // Cree le formulaire de modification du reglage des forums de l'article
-// http://doc.spip.org/@inc_poster_dist
-function inc_poster_dist($id_article, $script, $args, $flag=false) {
+// http://doc.spip.org/@inc_regler_moderation_dist
+function inc_regler_moderation_dist($id_article, $script, $args, $flag=false) {
+	include_spip('inc/presentation');
 
 	global $spip_lang_right, $options, $connect_statut;
 
@@ -49,7 +50,7 @@ function inc_poster_dist($id_article, $script, $args, $flag=false) {
 	. "\n\t<select name='change_accepter_forum'
 		class='fondl'
 		style='font-size:10px;'
-		onchange=\"findObj_forcer('valider_poster_$id_article').style.visibility='visible';\"
+		onchange=\"findObj_forcer('valider_regler_moderation_$id_article').style.visibility='visible';\"
 		>";
 
 	foreach (array(
@@ -65,14 +66,14 @@ function inc_poster_dist($id_article, $script, $args, $flag=false) {
 	}
 	$r .= "\n\t</select>\n";
 
-	$r .= "<div align='$spip_lang_right' id='valider_poster_$id_article'"
+	$r .= "<div align='$spip_lang_right' id='valider_regler_moderation_$id_article'"
 	. " class='visible_au_chargement'"
 	. ">\n\t<input type='submit' class='fondo' style='font-size:10px' value='"
 	. _T('bouton_changer')
 	. "' /></div>\n";
 
-	$r = ajax_action_auteur('poster', $id_article, $script, $args, $r);
+	$r = ajax_action_auteur('regler_moderation', $id_article, $script, $args, $r);
 
-	return ajax_action_greffe("poster-$id_article", $r);
+	return ajax_action_greffe("regler_moderation-$id_article", $r);
 }
 ?>