From e1c60c3187d0e6c2622d4165e50adb728138b88d Mon Sep 17 00:00:00 2001
From: Fil <fil@rezo.net>
Date: Sun, 26 Feb 2006 18:56:05 +0000
Subject: [PATCH] =?UTF-8?q?retour=20des=20pr=C3=A9fixes=20exec=5F=20(et=20?=
=?UTF-8?q?action=5F=20pour=20les=20actions)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/action/autoriser.php | 2 +-
ecrire/action/cookie.php | 6 +-
ecrire/action/ical.php | 2 +-
ecrire/action/iconifier.php | 10 +-
ecrire/action/inscription.php | 2 +-
ecrire/action/instituer.php | 2 +-
ecrire/action/joindre.php | 2 +-
ecrire/action/pass.php | 4 +-
ecrire/action/purger.php | 2 +-
ecrire/action/redirect.php | 2 +-
ecrire/action/rss.php | 2 +-
ecrire/action/supprimer.php | 2 +-
ecrire/action/test_dirs.php | 2 +-
ecrire/action/tester.php | 2 +-
ecrire/action/tourner.php | 2 +-
ecrire/exec/accueil.php | 2 +-
ecrire/exec/admin_effacer.php | 2 +-
ecrire/exec/admin_repair.php | 2 +-
ecrire/exec/admin_tech.php | 2 +-
ecrire/exec/admin_vider.php | 2 +-
ecrire/exec/aide_index.php | 2 +-
ecrire/exec/ajax_page.php | 2 +-
ecrire/exec/articles.php | 6 +-
ecrire/exec/articles_edit.php | 6 +-
ecrire/exec/articles_forum.php | 2 +-
ecrire/exec/articles_ortho.php | 2 +-
ecrire/exec/articles_page.php | 2 +-
ecrire/exec/articles_tous.php | 2 +-
ecrire/exec/articles_versions.php | 2 +-
ecrire/exec/auteur_infos.php | 6 +-
ecrire/exec/auteurs.php | 2 +-
ecrire/exec/auteurs_edit.php | 2 +-
ecrire/exec/auth.php | 2 +-
ecrire/exec/breves.php | 2 +-
ecrire/exec/breves_edit.php | 2 +-
ecrire/exec/breves_voir.php | 2 +-
ecrire/exec/brouteur.php | 2 +-
ecrire/exec/brouteur_frame.php | 2 +-
ecrire/exec/calendrier.php | 2 +-
ecrire/exec/config_contenu.php | 2 +-
ecrire/exec/config_fonctions.php | 2 +-
ecrire/exec/config_lang.php | 2 +-
ecrire/exec/config_multilang.php | 2 +-
ecrire/exec/configuration.php | 2 +-
ecrire/exec/controle_forum.php | 2 +-
ecrire/exec/controle_petition.php | 2 +-
ecrire/exec/delete_all.php | 2 +-
ecrire/exec/documents_liste.php | 2 +-
ecrire/exec/export.php | 2 +-
ecrire/exec/export_all.php | 2 +-
ecrire/exec/forum.php | 2 +-
ecrire/exec/forum_admin.php | 4 +-
ecrire/exec/forum_envoi.php | 2 +-
ecrire/exec/import_all.php | 2 +-
ecrire/exec/install.php | 2 +-
ecrire/exec/js_menu_rubriques.php | 2 +-
ecrire/exec/lang_raccourcis.php | 2 +-
ecrire/exec/message.php | 6 +-
ecrire/exec/message_edit.php | 2 +-
ecrire/exec/messagerie.php | 2 +-
ecrire/exec/mots_edit.php | 2 +-
ecrire/exec/mots_tous.php | 2 +-
ecrire/exec/mots_type.php | 2 +-
ecrire/exec/naviguer.php | 2 +-
ecrire/exec/recherche.php | 2 +-
ecrire/exec/rubriques_edit.php | 2 +-
ecrire/exec/sites.php | 2 +-
ecrire/exec/sites_edit.php | 2 +-
ecrire/exec/sites_tous.php | 2 +-
ecrire/exec/statistiques_lang.php | 2 +-
ecrire/exec/statistiques_referers.php | 2 +-
ecrire/exec/statistiques_repartition.php | 2 +-
ecrire/exec/statistiques_svg.php | 2 +-
ecrire/exec/statistiques_visites.php | 2 +-
ecrire/exec/suivi_revisions.php | 2 +-
ecrire/exec/synchro.php | 2 +-
ecrire/exec/upgrade.php | 128 +++++++++++------------
ecrire/inc_admin.php | 4 +-
ecrire/inc_utils.php | 37 +++++--
ecrire/index.php | 14 ++-
ecrire/public.php | 4 +-
81 files changed, 192 insertions(+), 179 deletions(-)
diff --git a/ecrire/action/autoriser.php b/ecrire/action/autoriser.php
index 1fa2f1f4fb..4eafe53dfd 100644
--- a/ecrire/action/autoriser.php
+++ b/ecrire/action/autoriser.php
@@ -22,7 +22,7 @@ include_ecrire("inc_abstract_sql");# spip_insert / spip_fetch...
// il verifie soit que le demandeur est authentifie
// soit que le fichier est joint a au moins 1 article, breve ou rubrique publie
-function autoriser_dist()
+function action_autoriser_dist()
{
global $file, $arg, $toujours;
diff --git a/ecrire/action/cookie.php b/ecrire/action/cookie.php
index 55a5fd7fda..b767ba3c2f 100644
--- a/ecrire/action/cookie.php
+++ b/ecrire/action/cookie.php
@@ -10,10 +10,10 @@
* Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne. *
\***************************************************************************/
-function cookie_dist() {
+function action_cookie_dist() {
include_ecrire ("inc_session");
include_ecrire('inc_cookie');
- spip_cookie_dist();
+ action_spip_cookie_dist();
}
function auth_http($url, $essai_auth_http) {
@@ -38,7 +38,7 @@ function auth_http($url, $essai_auth_http) {
}
}
-function spip_cookie_dist()
+function action_spip_cookie_dist()
{
global
$auteur_session,
diff --git a/ecrire/action/ical.php b/ecrire/action/ical.php
index 587927a949..e408dbe146 100644
--- a/ecrire/action/ical.php
+++ b/ecrire/action/ical.php
@@ -28,7 +28,7 @@ function ligne_uid ($texte) {
echo filtrer_ical("UID:$texte @ " . $GLOBALS['meta']["adresse_site"])."\n";
}
-function ical_dist()
+function action_ical_dist()
{
global $id_auteur, $arg, $action, $titres;
if (verifier_low_sec($id_auteur, $arg, $action)) {
diff --git a/ecrire/action/iconifier.php b/ecrire/action/iconifier.php
index 8d7076c093..dc3cb6eb6c 100644
--- a/ecrire/action/iconifier.php
+++ b/ecrire/action/iconifier.php
@@ -12,7 +12,7 @@
if (!defined("_ECRIRE_INC_VERSION")) return;
-function iconifier_dist()
+function action_iconifier_dist()
{
global $action, $arg, $hash, $id_auteur;
include_ecrire("inc_session");
@@ -21,11 +21,11 @@ function iconifier_dist()
minipres(_T('info_acces_interdit'));
}
if ($_SERVER['REQUEST_METHOD'] == 'POST')
- spip_image_ajouter_dist();
- else spip_image_effacer_dist();
+ action_spip_image_ajouter_dist();
+ else action_spip_image_effacer_dist();
}
-function spip_image_effacer_dist() {
+function action_spip_image_effacer_dist() {
global $arg;
if (!strstr($arg, ".."))
@@ -38,7 +38,7 @@ function spip_image_effacer_dist() {
// $source = $_FILES[0]
// $dest = arton12.xxx
-function spip_image_ajouter_dist() {
+function action_spip_image_ajouter_dist() {
global $sousaction2, $source, $arg;
include_ecrire('inc_getdocument');
diff --git a/ecrire/action/inscription.php b/ecrire/action/inscription.php
index 6b6f9e8905..a79e584e11 100644
--- a/ecrire/action/inscription.php
+++ b/ecrire/action/inscription.php
@@ -10,7 +10,7 @@
* Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne. *
\***************************************************************************/
-function inscription_dist() {
+function action_inscription_dist() {
include_local(find_in_path("inc-formulaire_inscription" . _EXTENSION_PHP));
include_spip('public/global');
diff --git a/ecrire/action/instituer.php b/ecrire/action/instituer.php
index 0a22666833..5c7aa82c55 100644
--- a/ecrire/action/instituer.php
+++ b/ecrire/action/instituer.php
@@ -12,7 +12,7 @@
if (!defined("_ECRIRE_INC_VERSION")) return;
-function instituer_dist()
+function action_instituer_dist()
{
global $action, $arg, $hash, $id_auteur;
include_ecrire("inc_session");
diff --git a/ecrire/action/joindre.php b/ecrire/action/joindre.php
index e150d2faa9..f1f0b2b607 100644
--- a/ecrire/action/joindre.php
+++ b/ecrire/action/joindre.php
@@ -16,7 +16,7 @@ include_ecrire("inc_charsets"); # pour le nom de fichier
include_ecrire("inc_abstract_sql");# spip_insert / spip_fetch...
include_ecrire('inc_getdocument');
-function joindre_dist()
+function action_joindre_dist()
{
global $action, $arg, $hash, $id_auteur, $redirect,
$sousaction1,
diff --git a/ecrire/action/pass.php b/ecrire/action/pass.php
index c1a779c502..e38122a712 100644
--- a/ecrire/action/pass.php
+++ b/ecrire/action/pass.php
@@ -83,7 +83,7 @@ $message = '';
'action' => generer_url_action('pass')));
}
-function pass_dist()
+function action_pass_dist()
{
global $p, $oubli;
install_debut_html( _T('pass_mot_oublie'));
@@ -91,6 +91,6 @@ function pass_dist()
install_fin_html();
}
-#spip_pass_dist();
+#action_spip_pass_dist();
?>
diff --git a/ecrire/action/purger.php b/ecrire/action/purger.php
index 008a4c0aca..df8be7dd0f 100644
--- a/ecrire/action/purger.php
+++ b/ecrire/action/purger.php
@@ -12,7 +12,7 @@
if (!defined("_ECRIRE_INC_VERSION")) return; // securiser
-function purger_dist()
+function action_purger_dist()
{
global $action, $arg, $hash, $id_auteur;
include_ecrire("inc_session");
diff --git a/ecrire/action/redirect.php b/ecrire/action/redirect.php
index 764138833f..9abf343cb9 100644
--- a/ecrire/action/redirect.php
+++ b/ecrire/action/redirect.php
@@ -17,7 +17,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
charger_generer_url();
-function redirect_dist()
+function action_redirect_dist()
{
global $id_article, $id_auteur, $id_breve, $id_forum, $id_mot, $id_rubrique, $id_site, $id_syndic, $var_mode;
diff --git a/ecrire/action/rss.php b/ecrire/action/rss.php
index d2d23acfff..4e3467d2c2 100644
--- a/ecrire/action/rss.php
+++ b/ecrire/action/rss.php
@@ -354,7 +354,7 @@ function rss_sites($critere) {
// On cree ensuite le RSS correspondant a l'operation
-function rss_dist()
+function action_rss_dist()
{
global $args, $cle, $fmt, $id, $lang, $op;
diff --git a/ecrire/action/supprimer.php b/ecrire/action/supprimer.php
index df49d85bd6..c388858254 100644
--- a/ecrire/action/supprimer.php
+++ b/ecrire/action/supprimer.php
@@ -16,7 +16,7 @@ include_ecrire("inc_charsets"); # pour le nom de fichier
include_ecrire("inc_abstract_sql");# spip_insert / spip_fetch...
// Effacer un doc (et sa vignette)
-function supprimer_dist() {
+function action_supprimer_dist() {
global $redirect;
global $action, $arg, $hash, $id_auteur;
diff --git a/ecrire/action/test_dirs.php b/ecrire/action/test_dirs.php
index e13a92a298..e29f04fd18 100644
--- a/ecrire/action/test_dirs.php
+++ b/ecrire/action/test_dirs.php
@@ -35,7 +35,7 @@ function test_ecrire($my_dir) {
// rajouter celui passer dans l'url ou celui du source (a l'installation)
//
-function test_dirs_dist()
+function action_test_dirs_dist()
{
global $test_dir, $test_dirs;
diff --git a/ecrire/action/tester.php b/ecrire/action/tester.php
index d5f71f894b..e0de430433 100644
--- a/ecrire/action/tester.php
+++ b/ecrire/action/tester.php
@@ -14,7 +14,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
include_ecrire("inc_meta");
// Tester nos capacites
-function tester_dist() {
+function action_tester_dist() {
global $pnmscale_command,$arg;
// verifier les formats acceptes par GD
diff --git a/ecrire/action/tourner.php b/ecrire/action/tourner.php
index 24edb8effd..91baaca102 100644
--- a/ecrire/action/tourner.php
+++ b/ecrire/action/tourner.php
@@ -15,7 +15,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
include_ecrire("inc_charsets"); # pour le nom de fichier
include_ecrire("inc_abstract_sql");# spip_insert / spip_fetch...
-function tourner_dist() {
+function action_tourner_dist() {
global $var_rot, $convert_command, $redirect;
global $action, $arg, $hash, $id_auteur;
diff --git a/ecrire/exec/accueil.php b/ecrire/exec/accueil.php
index db616c51a4..01bf458ecd 100644
--- a/ecrire/exec/accueil.php
+++ b/ecrire/exec/accueil.php
@@ -423,7 +423,7 @@ if ($spip_display != 4) {
-function accueil_dist()
+function exec_accueil_dist()
{
global $id_rubrique, $meta, $connect_statut, $options, $connect_id_auteur, $flag_ob;
diff --git a/ecrire/exec/admin_effacer.php b/ecrire/exec/admin_effacer.php
index 36c9a3eb7b..5d2fafdbfc 100644
--- a/ecrire/exec/admin_effacer.php
+++ b/ecrire/exec/admin_effacer.php
@@ -14,7 +14,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
include_ecrire("inc_presentation");
-function admin_effacer_dist()
+function exec_admin_effacer_dist()
{
global $connect_statut, $connect_toutes_rubriques, $couleur_foncee;
diff --git a/ecrire/exec/admin_repair.php b/ecrire/exec/admin_repair.php
index 29d2848fa1..316e508c1e 100644
--- a/ecrire/exec/admin_repair.php
+++ b/ecrire/exec/admin_repair.php
@@ -62,7 +62,7 @@ function verifier_base() {
return $res;
}
-function admin_repair_dist()
+function exec_admin_repair_dist()
{
// verifier version MySQL
diff --git a/ecrire/exec/admin_tech.php b/ecrire/exec/admin_tech.php
index 58f7a49a3e..da0983ced5 100644
--- a/ecrire/exec/admin_tech.php
+++ b/ecrire/exec/admin_tech.php
@@ -14,7 +14,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
include_ecrire("inc_presentation");
-function admin_tech_dist()
+function exec_admin_tech_dist()
{
global $connect_statut, $connect_toutes_rubriques, $couleur_foncee, $flag_gz, $options;
diff --git a/ecrire/exec/admin_vider.php b/ecrire/exec/admin_vider.php
index 1dfbd5371d..92f0e51f49 100644
--- a/ecrire/exec/admin_vider.php
+++ b/ecrire/exec/admin_vider.php
@@ -14,7 +14,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
include_ecrire("inc_presentation");
-function admin_vider_dist()
+function exec_admin_vider_dist()
{
global
$connect_id_auteur,
diff --git a/ecrire/exec/aide_index.php b/ecrire/exec/aide_index.php
index c826b70c3a..57c3585cc0 100644
--- a/ecrire/exec/aide_index.php
+++ b/ecrire/exec/aide_index.php
@@ -446,7 +446,7 @@ function analyse_aide($html, $aide=false) {
//
// Distribuer le travail
//
-function aide_index_dist()
+function exec_aide_index_dist()
{
global $img, $frame, $aide, $var_lang, $lang;
// Eviter les calculs evitables (surtout en client/serveur sans cache !)
diff --git a/ecrire/exec/ajax_page.php b/ecrire/exec/ajax_page.php
index 48119cbe8a..c44043dfed 100644
--- a/ecrire/exec/ajax_page.php
+++ b/ecrire/exec/ajax_page.php
@@ -14,7 +14,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
# gerer un charset minimaliste en convertissant tout en unicode &#xxx;
-function ajax_page_dist()
+function exec_ajax_page_dist()
{
global $flag_ob, $fonction, $id, $exclus, $col, $id_ajax_fonc, $type, $rac;
$id = intval($id);
diff --git a/ecrire/exec/articles.php b/ecrire/exec/articles.php
index a9d75f54a9..4758f8e72b 100644
--- a/ecrire/exec/articles.php
+++ b/ecrire/exec/articles.php
@@ -26,7 +26,7 @@ include_ecrire ("inc_abstract_sql");
// 28 paremetres, qui dit mieux ?
// moi ! elle en avait 61 en premiere approche
-function affiche_articles_dist($id_article, $ajout_auteur, $change_accepter_forum, $change_petition, $changer_virtuel, $cherche_auteur, $cherche_mot, $debut, $email_unique, $flag_auteur, $flag_editable, $langue_article, $message, $nom_select, $nouv_auteur, $nouv_mot, $rubrique_article, $site_obli, $site_unique, $supp_auteur, $supp_mot, $texte_petition, $titre_article, $lier_trad)
+function exec_affiche_articles_dist($id_article, $ajout_auteur, $change_accepter_forum, $change_petition, $changer_virtuel, $cherche_auteur, $cherche_mot, $debut, $email_unique, $flag_auteur, $flag_editable, $langue_article, $message, $nom_select, $nouv_auteur, $nouv_mot, $rubrique_article, $site_obli, $site_unique, $supp_auteur, $supp_mot, $texte_petition, $titre_article, $lier_trad)
{
global $options, $spip_display, $spip_lang_left, $spip_lang_right, $dir_lang;
@@ -1544,7 +1544,7 @@ function insert_article($id_parent, $new)
}
// Y a-t-il vraiment 56 variables determinant l'edition d'un article ?
-function articles_dist()
+function exec_articles_dist()
{
global $ajout_auteur, $annee, $annee_redac, $avec_redac, $champs_extra, $change_accepter_forum, $change_petition, $changer_lang, $changer_virtuel, $chapo, $cherche_auteur, $cherche_mot, $connect_id_auteur, $date, $date_redac, $debut, $descriptif, $email_unique, $heure, $heure_redac, $id_article, $id_article_bloque, $id_parent, $id_rubrique_old, $id_secteur, $jour, $jour_redac, $langue_article, $lier_trad, $message, $minute, $minute_redac, $mois, $mois_redac, $new, $nom_select, $nom_site, $nouv_auteur, $nouv_mot, $ps, $row, $site_obli, $site_unique, $soustitre, $statut_nouv, $supp_auteur, $supp_mot, $surtitre, $texte, $texte_petition, $texte_plus, $titre, $titre_article, $url_site, $virtuel;
@@ -1647,7 +1647,7 @@ if ($titre) {
}
}
-affiche_articles_dist($id_article, $ajout_auteur, $change_accepter_forum, $change_petition, $changer_virtuel, $cherche_auteur, $cherche_mot, $debut, $email_unique, $flag_auteur, $flag_editable, $langue_article, $message, $nom_select, $nouv_auteur, $nouv_mot, $id_rubrique, $site_obli, $site_unique, $supp_auteur, $supp_mot, $texte_petition, $titre_article, $lier_trad);
+exec_affiche_articles_dist($id_article, $ajout_auteur, $change_accepter_forum, $change_petition, $changer_virtuel, $cherche_auteur, $cherche_mot, $debut, $email_unique, $flag_auteur, $flag_editable, $langue_article, $message, $nom_select, $nouv_auteur, $nouv_mot, $id_rubrique, $site_obli, $site_unique, $supp_auteur, $supp_mot, $texte_petition, $titre_article, $lier_trad);
// Taches lentes
diff --git a/ecrire/exec/articles_edit.php b/ecrire/exec/articles_edit.php
index 840bc08049..5ebdb07de2 100644
--- a/ecrire/exec/articles_edit.php
+++ b/ecrire/exec/articles_edit.php
@@ -272,7 +272,7 @@ echo "<P><HR><P>";
}
-function affiche_articles_edit_dist($flag_editable, $id_article, $id_rubrique, $titre, $soustitre, $surtitre, $descriptif, $url, $chapo, $texte, $ps, $new, $nom_site, $url_site, $extra, $id_secteur, $date, $onfocus, $lier_trad, $champs_article)
+function exec_affiche_articles_edit_dist($flag_editable, $id_article, $id_rubrique, $titre, $soustitre, $surtitre, $descriptif, $url, $chapo, $texte, $ps, $new, $nom_site, $url_site, $extra, $id_secteur, $date, $onfocus, $lier_trad, $champs_article)
{
global $champs_extra;
debut_page(_T('titre_page_articles_edit', array('titre' => $titre)), "documents", "articles", "hauteurTextarea();");
@@ -312,7 +312,7 @@ fin_page();
// Creation de l'objet article
//
-function articles_edit_dist()
+function exec_articles_edit_dist()
{
global $connect_id_auteur, $spip_lang, $id_article, $id_rubrique, $lier_trad, $new;
$id_article = intval($id_article);
@@ -453,7 +453,7 @@ if (!$flag_editable) {
spip_query("UPDATE spip_articles SET date_modif=NOW(), auteur_modif=$connect_id_auteur WHERE id_article=$id_article");
- affiche_articles_edit_dist($flag_editable, $id_article, $id_rubrique, $titre, $soustitre, $surtitre, $descriptif, $url, $chapo, $texte, $ps, $new, $nom_site, $url_site, $extra, $id_secteur, $date, $onfocus, $lier_trad, $GLOBALS['meta']);
+ exec_affiche_articles_edit_dist($flag_editable, $id_article, $id_rubrique, $titre, $soustitre, $surtitre, $descriptif, $url, $chapo, $texte, $ps, $new, $nom_site, $url_site, $extra, $id_secteur, $date, $onfocus, $lier_trad, $GLOBALS['meta']);
}
?>
diff --git a/ecrire/exec/articles_forum.php b/ecrire/exec/articles_forum.php
index ad9c1d9172..c9b5c3b6b2 100644
--- a/ecrire/exec/articles_forum.php
+++ b/ecrire/exec/articles_forum.php
@@ -14,7 +14,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
include_ecrire("inc_presentation");
include_ecrire('inc_forum'); // pour boutons_controle_forum
-function articles_forum_dist()
+function exec_articles_forum_dist()
{
global $connect_statut, $debut, $forum_retour, $id_article;
diff --git a/ecrire/exec/articles_ortho.php b/ecrire/exec/articles_ortho.php
index 6b54abd02a..6b73ec80fd 100644
--- a/ecrire/exec/articles_ortho.php
+++ b/ecrire/exec/articles_ortho.php
@@ -16,7 +16,7 @@ include_ecrire("inc_presentation");
include_ecrire("inc_distant");
include_ecrire("inc_ortho");
-function articles_ortho_dist()
+function exec_articles_ortho_dist()
{
global
$browser_name,
diff --git a/ecrire/exec/articles_page.php b/ecrire/exec/articles_page.php
index 885188ad06..5d1f340776 100644
--- a/ecrire/exec/articles_page.php
+++ b/ecrire/exec/articles_page.php
@@ -17,7 +17,7 @@ include_ecrire("inc_texte");
charger_generer_url();
include_ecrire("inc_rubriques");
-function articles_page_dist()
+function exec_articles_page_dist()
{
global $connect_statut, $connect_id_auteur;
diff --git a/ecrire/exec/articles_tous.php b/ecrire/exec/articles_tous.php
index 5c2b348cef..66dc2be4eb 100644
--- a/ecrire/exec/articles_tous.php
+++ b/ecrire/exec/articles_tous.php
@@ -14,7 +14,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
include_ecrire("inc_presentation");
-function articles_tous_dist()
+function exec_articles_tous_dist()
{
global $aff_art, $aff_statut, $sel_lang,
$article, $enfant, $text_article, $first_couche, $last_couche;
diff --git a/ecrire/exec/articles_versions.php b/ecrire/exec/articles_versions.php
index 99c0ca2c1f..097ef5c5e7 100644
--- a/ecrire/exec/articles_versions.php
+++ b/ecrire/exec/articles_versions.php
@@ -16,7 +16,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
include_ecrire("inc_presentation");
include_ecrire("inc_revisions");
-function articles_versions_dist()
+function exec_articles_versions_dist()
{
global
$champs_extra,
diff --git a/ecrire/exec/auteur_infos.php b/ecrire/exec/auteur_infos.php
index ae934ad1e4..9f79396bd6 100644
--- a/ecrire/exec/auteur_infos.php
+++ b/ecrire/exec/auteur_infos.php
@@ -16,7 +16,7 @@ include_ecrire("inc_auteur_voir");
include_ecrire ("inc_acces");
include_ecrire ("inc_abstract_sql");
-function auteur_infos_dist()
+function exec_auteur_infos_dist()
{
global $ajouter_id_article,
$bio,
@@ -199,11 +199,11 @@ if ($nom OR $statut) {
if (!$echec AND $redirect_ok == "oui") {
redirige_par_entete($redirect ? rawurldecode($redirect) : generer_url_ecrire("auteurs_edit", "id_auteur=$id_auteur", true));
}
-affiche_auteur_info_dist($id_auteur, $auteur, $echec, $redirect, $ajouter_id_article, $onfocus);
+exec_affiche_auteur_info_dist($id_auteur, $auteur, $echec, $redirect, $ajouter_id_article, $onfocus);
}
-function affiche_auteur_info_dist($id_auteur, $auteur, $echec, $redirect, $ajouter_id_article, $onfocus)
+function exec_affiche_auteur_info_dist($id_auteur, $auteur, $echec, $redirect, $ajouter_id_article, $onfocus)
{
global $connect_id_auteur, $extra;
diff --git a/ecrire/exec/auteurs.php b/ecrire/exec/auteurs.php
index 44bbc38a27..eda7965562 100644
--- a/ecrire/exec/auteurs.php
+++ b/ecrire/exec/auteurs.php
@@ -19,7 +19,7 @@ include_ecrire("inc_presentation");
// et memoriser la liste des lettres initiales
//
-function auteurs_dist()
+function exec_auteurs_dist()
{
global $debut, $tri, $visiteurs;
diff --git a/ecrire/exec/auteurs_edit.php b/ecrire/exec/auteurs_edit.php
index bf98da223d..f3800e38be 100644
--- a/ecrire/exec/auteurs_edit.php
+++ b/ecrire/exec/auteurs_edit.php
@@ -16,7 +16,7 @@ include_ecrire("inc_presentation");
include_ecrire("inc_logos");
include_ecrire("inc_auteur_voir");
-function auteurs_edit_dist()
+function exec_auteurs_edit_dist()
{
global $connect_id_auteur, $id_auteur;
$id_auteur = intval($id_auteur);
diff --git a/ecrire/exec/auth.php b/ecrire/exec/auth.php
index cfcd34589c..b106f4a6dc 100644
--- a/ecrire/exec/auth.php
+++ b/ecrire/exec/auth.php
@@ -32,7 +32,7 @@ function acces_restreint_rubrique($id_rubrique) {
}
-function auth_dist() {
+function exec_auth_dist() {
global $_POST, $_GET, $_COOKIE, $_SERVER;
global $auth_can_disconnect, $ignore_auth_http, $ignore_remote_user;
diff --git a/ecrire/exec/breves.php b/ecrire/exec/breves.php
index 4d5abda4a7..540b220298 100644
--- a/ecrire/exec/breves.php
+++ b/ecrire/exec/breves.php
@@ -49,7 +49,7 @@ function enfant_breves($leparent){
}
}
-function breves_dist()
+function exec_breves_dist()
{
global $connect_statut,$id_breve, $statut, $id_rubrique;
if ($statut AND $connect_statut == "0minirezo") {
diff --git a/ecrire/exec/breves_edit.php b/ecrire/exec/breves_edit.php
index 1e84150dd4..ccc608a780 100644
--- a/ecrire/exec/breves_edit.php
+++ b/ecrire/exec/breves_edit.php
@@ -17,7 +17,7 @@ include_ecrire("inc_rubriques");
include_ecrire ("inc_documents");
include_spip ('inc_barre');
-function breves_edit_dist()
+function exec_breves_edit_dist()
{
global
$champs_extra,
diff --git a/ecrire/exec/breves_voir.php b/ecrire/exec/breves_voir.php
index 484aba31fd..162ad6fd61 100644
--- a/ecrire/exec/breves_voir.php
+++ b/ecrire/exec/breves_voir.php
@@ -236,7 +236,7 @@ afficher_forum(spip_query("SELECT * FROM spip_forum WHERE statut='prive' AND id_
fin_page();
}
-function breves_voir_dist()
+function exec_breves_voir_dist()
{
global $id_breve, $id_parent, $texte, $titre, $statut,
$annee, $mois, $jour, $lien_titre, $lien_url,$champs_extra,
diff --git a/ecrire/exec/brouteur.php b/ecrire/exec/brouteur.php
index fad200d706..46ffac010b 100644
--- a/ecrire/exec/brouteur.php
+++ b/ecrire/exec/brouteur.php
@@ -14,7 +14,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
include_ecrire("inc_presentation");
-function brouteur_dist()
+function exec_brouteur_dist()
{
global $spip_ecran, $spip_lang_left,$id_rubrique;
diff --git a/ecrire/exec/brouteur_frame.php b/ecrire/exec/brouteur_frame.php
index 1647191f75..137f7606c4 100644
--- a/ecrire/exec/brouteur_frame.php
+++ b/ecrire/exec/brouteur_frame.php
@@ -14,7 +14,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
include_ecrire("inc_presentation");
-function brouteur_frame_dist()
+function exec_brouteur_frame_dist()
{
global $connect_statut,$connect_id_auteur, $spip_ecran, $spip_lang_left,$id_rubrique, $frame, $effacer_suivant, $special;
$id_rubrique = is_numeric($id_rubrique) ? intval($id_rubrique) : "";
diff --git a/ecrire/exec/calendrier.php b/ecrire/exec/calendrier.php
index 38dfe1daa6..2c327ee2d8 100644
--- a/ecrire/exec/calendrier.php
+++ b/ecrire/exec/calendrier.php
@@ -14,7 +14,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
include_ecrire("inc_agenda");
-function calendrier_dist()
+function exec_calendrier_dist()
{
global $type, $css;
// icones standards, fonction de la direction de la langue
diff --git a/ecrire/exec/config_contenu.php b/ecrire/exec/config_contenu.php
index c524ea8657..1487240686 100644
--- a/ecrire/exec/config_contenu.php
+++ b/ecrire/exec/config_contenu.php
@@ -16,7 +16,7 @@ include_ecrire("inc_presentation");
include_ecrire("inc_mail");
include_ecrire ("inc_config");
-function config_contenu_dist()
+function exec_config_contenu_dist()
{
global $connect_statut, $connect_toutes_rubriques, $options, $spip_lang_right, $spip_lang_left,$changer_config, $envoi_now ;
diff --git a/ecrire/exec/config_fonctions.php b/ecrire/exec/config_fonctions.php
index d0a82c4ae2..8428bf0a80 100644
--- a/ecrire/exec/config_fonctions.php
+++ b/ecrire/exec/config_fonctions.php
@@ -15,7 +15,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
include_ecrire("inc_presentation");
include_ecrire ("inc_config");
-function config_fonctions_dist()
+function exec_config_fonctions_dist()
{
global $connect_statut, $connect_toutes_rubriques, $changer_config;
if ($connect_statut != '0minirezo' OR !$connect_toutes_rubriques) {
diff --git a/ecrire/exec/config_lang.php b/ecrire/exec/config_lang.php
index 1b60f2ff45..2a1714f681 100644
--- a/ecrire/exec/config_lang.php
+++ b/ecrire/exec/config_lang.php
@@ -16,7 +16,7 @@ include_ecrire("inc_presentation");
include_ecrire("inc_rubriques");
include_ecrire ("inc_config");
-function config_lang_dist()
+function exec_config_lang_dist()
{
global $connect_statut, $connect_toutes_rubriques, $options, $spip_lang_right, $all_langs, $changer_config;
diff --git a/ecrire/exec/config_multilang.php b/ecrire/exec/config_multilang.php
index 26e143e589..def2485a7d 100644
--- a/ecrire/exec/config_multilang.php
+++ b/ecrire/exec/config_multilang.php
@@ -16,7 +16,7 @@ include_ecrire("inc_presentation");
include_ecrire("inc_rubriques");
include_ecrire ("inc_config");
-function config_multilang_dist()
+function exec_config_multilang_dist()
{
global $connect_statut, $connect_toutes_rubriques, $couleur_foncee, $spip_lang_right, $changer_config;
diff --git a/ecrire/exec/configuration.php b/ecrire/exec/configuration.php
index 39b05826e5..c1c54d7854 100644
--- a/ecrire/exec/configuration.php
+++ b/ecrire/exec/configuration.php
@@ -15,7 +15,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
include_ecrire("inc_presentation");
include_ecrire ("inc_config");
-function configuration_dist()
+function exec_configuration_dist()
{
global $connect_statut, $connect_toutes_rubriques, $options, $spip_lang_left, $spip_lang_right,$changer_config;
diff --git a/ecrire/exec/controle_forum.php b/ecrire/exec/controle_forum.php
index b5d0336cd9..e239e19bea 100644
--- a/ecrire/exec/controle_forum.php
+++ b/ecrire/exec/controle_forum.php
@@ -197,7 +197,7 @@ function controle_un_forum($row, $rappel) {
// Debut de la page de controle
//
-function controle_forum_dist()
+function exec_controle_forum_dist()
{
global $page, $debut, $debut_id_forum, $id_rubrique, $connect_statut, $connect_toutes_rubriques;
diff --git a/ecrire/exec/controle_petition.php b/ecrire/exec/controle_petition.php
index d90f4ad277..5f5ca053f6 100644
--- a/ecrire/exec/controle_petition.php
+++ b/ecrire/exec/controle_petition.php
@@ -20,7 +20,7 @@ function message_de_signature($row)
return propre(echapper_tags($row['message']));
}
-function controle_petition_dist()
+function exec_controle_petition_dist()
{
global $connect_statut, $id_article, $add_petition, $supp_petition, $debut;
diff --git a/ecrire/exec/delete_all.php b/ecrire/exec/delete_all.php
index 5a9737910d..82317e254d 100644
--- a/ecrire/exec/delete_all.php
+++ b/ecrire/exec/delete_all.php
@@ -14,7 +14,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
include_ecrire('inc_admin');
-function delete_all_dist()
+function exec_delete_all_dist()
{
$action = _T('titre_page_delete_all');
diff --git a/ecrire/exec/documents_liste.php b/ecrire/exec/documents_liste.php
index c779da11d6..0d6192db4a 100644
--- a/ecrire/exec/documents_liste.php
+++ b/ecrire/exec/documents_liste.php
@@ -14,7 +14,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
include_ecrire("inc_presentation");
-function documents_liste_dist()
+function exec_documents_liste_dist()
{
//
diff --git a/ecrire/exec/export.php b/ecrire/exec/export.php
index 97e2f83fe8..82f693a3bc 100644
--- a/ecrire/exec/export.php
+++ b/ecrire/exec/export.php
@@ -81,7 +81,7 @@ function liste_rubriques($id_rubrique) {
return $rubriques;
}
-function export_dist()
+function exec_export_dist()
{
global $id_rubrique, $maj;
diff --git a/ecrire/exec/export_all.php b/ecrire/exec/export_all.php
index 2cd9c710d9..5be43df8f8 100644
--- a/ecrire/exec/export_all.php
+++ b/ecrire/exec/export_all.php
@@ -16,7 +16,7 @@ $GLOBALS['version_archive'] = '1.2';
include_ecrire('inc_admin');
-function export_all_dist()
+function exec_export_all_dist()
{
global $archive, $debut_limit, $etape, $gz, $spip_version, $spip_version_affichee, $version_archive;
diff --git a/ecrire/exec/forum.php b/ecrire/exec/forum.php
index c371a484ad..25c9c39851 100644
--- a/ecrire/exec/forum.php
+++ b/ecrire/exec/forum.php
@@ -30,7 +30,7 @@ function liste_numeros_forum($urlforum, $debut, $total)
echo "\n</p>\n";
}
-function forum_dist()
+function exec_forum_dist()
{
global $connect_statut, $debut, $admin;
diff --git a/ecrire/exec/forum_admin.php b/ecrire/exec/forum_admin.php
index 36ca9d84f8..42d25f6dcb 100644
--- a/ecrire/exec/forum_admin.php
+++ b/ecrire/exec/forum_admin.php
@@ -12,10 +12,10 @@
if (!defined("_ECRIRE_INC_VERSION")) return;
-function forum_admin_dist() {
+function exec_forum_admin_dist() {
include_spip('exec/forum');
$GLOBALS['admin'] = 'oui';
- forum_dist();
+ exec_forum_dist();
}
?>
diff --git a/ecrire/exec/forum_envoi.php b/ecrire/exec/forum_envoi.php
index 46f772d62b..d1bbd4c7bd 100644
--- a/ecrire/exec/forum_envoi.php
+++ b/ecrire/exec/forum_envoi.php
@@ -16,7 +16,7 @@ include_ecrire("inc_presentation");
include_spip ('inc_barre');
include_ecrire ("inc_forum");
-function forum_envoi_dist()
+function exec_forum_envoi_dist()
{
global
$adresse_retour,
diff --git a/ecrire/exec/import_all.php b/ecrire/exec/import_all.php
index 6eda3fa4f9..ac58319db7 100644
--- a/ecrire/exec/import_all.php
+++ b/ecrire/exec/import_all.php
@@ -62,7 +62,7 @@ function import_all_check() {
exit;
}
-function import_all_dist()
+function exec_import_all_dist()
{
// si l'appel est explicite, passer par l'authentification ftp
if (!$GLOBALS['meta']["debut_restauration"])
diff --git a/ecrire/exec/install.php b/ecrire/exec/install.php
index 0ffae155dd..98ac58fd0d 100644
--- a/ecrire/exec/install.php
+++ b/ecrire/exec/install.php
@@ -18,7 +18,7 @@ include_ecrire ("inc_minipres");
include_ecrire ("inc_base");
include_ecrire("inc_db_mysql");
-function install_dist()
+function exec_install_dist()
{
global $etape;
if (_FILE_CONNECT && $etape != 'unpack') {
diff --git a/ecrire/exec/js_menu_rubriques.php b/ecrire/exec/js_menu_rubriques.php
index ef570dd6ba..8238f40c40 100644
--- a/ecrire/exec/js_menu_rubriques.php
+++ b/ecrire/exec/js_menu_rubriques.php
@@ -150,7 +150,7 @@ function bandeau_rubrique($id_rubrique, $titre_rubrique, $z = 1) {
return $ret;
}
-function js_menu_rubriques_dist()
+function exec_js_menu_rubriques_dist()
{
if (http_last_modified(@filemtime("js_menu_rubriques.php"), time() + 24 * 3600))
exit;
diff --git a/ecrire/exec/lang_raccourcis.php b/ecrire/exec/lang_raccourcis.php
index 166305bcc6..79123e518c 100644
--- a/ecrire/exec/lang_raccourcis.php
+++ b/ecrire/exec/lang_raccourcis.php
@@ -14,7 +14,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
include_ecrire("inc_presentation");
-function lang_raccourcis_dist()
+function exec_lang_raccourcis_dist()
{
global $changer_config, $couleur_foncee, $spip_lang, $spip_lang_left;
diff --git a/ecrire/exec/message.php b/ecrire/exec/message.php
index 02a3a0b417..671838edb0 100644
--- a/ecrire/exec/message.php
+++ b/ecrire/exec/message.php
@@ -17,7 +17,7 @@ charger_generer_url();
include_ecrire("inc_rubriques");
include_ecrire ("inc_mots");
-function message_dist()
+function exec_message_dist()
{
global
$ajout_forum,
@@ -87,7 +87,7 @@ if ($supp_dest) {
spip_query("DELETE FROM spip_auteurs_messages WHERE id_message='$id_message' AND id_auteur='$supp_dest'");
}
- affiche_message_dist($id_message, $cherche_auteur, $nouv_auteur);
+ exec_affiche_message_dist($id_message, $cherche_auteur, $nouv_auteur);
}
@@ -468,7 +468,7 @@ function change_date_message($id_message, $heures,$minutes,$mois, $jour, $annee,
-function affiche_message_dist($id_message, $cherche_auteur, $nouv_auteur)
+function exec_affiche_message_dist($id_message, $cherche_auteur, $nouv_auteur)
{
global $connect_id_auteur, $echelle, $partie_cal;
if ($row = spip_fetch_array(spip_query("SELECT * FROM spip_messages WHERE id_message=$id_message"))) {
diff --git a/ecrire/exec/message_edit.php b/ecrire/exec/message_edit.php
index 7c05eb9fb0..daaa82b90c 100644
--- a/ecrire/exec/message_edit.php
+++ b/ecrire/exec/message_edit.php
@@ -16,7 +16,7 @@ include_ecrire("inc_presentation");
include_ecrire ("inc_date");
include_ecrire ("inc_abstract_sql");
-function message_edit_dist()
+function exec_message_edit_dist()
{
global
$connect_id_auteur,
diff --git a/ecrire/exec/messagerie.php b/ecrire/exec/messagerie.php
index 56c1e79e63..3d4c007067 100644
--- a/ecrire/exec/messagerie.php
+++ b/ecrire/exec/messagerie.php
@@ -14,7 +14,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
include_ecrire("inc_presentation");
-function messagerie_dist()
+function exec_messagerie_dist()
{
global $connect_id_auteur, $connect_statut, $couleur_claire, $spip_lang_rtl;
diff --git a/ecrire/exec/mots_edit.php b/ecrire/exec/mots_edit.php
index 4a5a0afd69..c703de7cfa 100644
--- a/ecrire/exec/mots_edit.php
+++ b/ecrire/exec/mots_edit.php
@@ -16,7 +16,7 @@ include_ecrire("inc_presentation");
include_ecrire ("inc_logos");
include_ecrire ("inc_abstract_sql");
-function mots_edit_dist()
+function exec_mots_edit_dist()
{
global
$ajouter_id_article,
diff --git a/ecrire/exec/mots_tous.php b/ecrire/exec/mots_tous.php
index dd22f5c589..88129240c0 100644
--- a/ecrire/exec/mots_tous.php
+++ b/ecrire/exec/mots_tous.php
@@ -15,7 +15,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
include_ecrire("inc_presentation");
include_ecrire("inc_mots");
-function mots_tous_dist()
+function exec_mots_tous_dist()
{
global $acces_comite, $acces_forum, $acces_minirezo, $ancien_type, $articles, $breves, $change_type, $conf_mot, $connect_statut, $connect_toutes_rubriques, $descriptif, $id_groupe, $modifier_groupe, $obligatoire, $rubriques, $spip_lang, $spip_lang_right, $supp_group, $syndic, $texte, $unseul;
diff --git a/ecrire/exec/mots_type.php b/ecrire/exec/mots_type.php
index 2708762cc7..f258fa1f2f 100644
--- a/ecrire/exec/mots_type.php
+++ b/ecrire/exec/mots_type.php
@@ -14,7 +14,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
include_ecrire("inc_presentation");
-function mots_type_dist()
+function exec_mots_type_dist()
{
global $connect_statut, $descriptif, $id_groupe, $new, $options, $texte, $titre;
diff --git a/ecrire/exec/naviguer.php b/ecrire/exec/naviguer.php
index 432196249a..ae4795a649 100644
--- a/ecrire/exec/naviguer.php
+++ b/ecrire/exec/naviguer.php
@@ -22,7 +22,7 @@ include_ecrire("inc_mots");
include_ecrire("inc_documents");
include_ecrire("inc_abstract_sql");
-function naviguer_dist()
+function exec_naviguer_dist()
{
global $action, $id_parent, $id_rubrique, $nouv_mot, $spip_display, $connect_statut, $supp_mot, $champs_extra, $cherche_mot, $descriptif, $texte, $titre, $changer_lang;
diff --git a/ecrire/exec/recherche.php b/ecrire/exec/recherche.php
index ab2e854c9a..8042453362 100644
--- a/ecrire/exec/recherche.php
+++ b/ecrire/exec/recherche.php
@@ -15,7 +15,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
include_ecrire("inc_presentation");
include_ecrire("inc_sites_voir");
-function recherche_dist()
+function exec_recherche_dist()
{
global $couleur_foncee, $recherche;
diff --git a/ecrire/exec/rubriques_edit.php b/ecrire/exec/rubriques_edit.php
index 9a2ce456c5..a2bf8f7a4a 100644
--- a/ecrire/exec/rubriques_edit.php
+++ b/ecrire/exec/rubriques_edit.php
@@ -15,7 +15,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
include_ecrire("inc_presentation");
include_ecrire("inc_rubriques");
-function rubriques_edit_dist()
+function exec_rubriques_edit_dist()
{
global
$champs_extra,
diff --git a/ecrire/exec/sites.php b/ecrire/exec/sites.php
index 06fc0518bc..335943d083 100644
--- a/ecrire/exec/sites.php
+++ b/ecrire/exec/sites.php
@@ -21,7 +21,7 @@ include_ecrire ("inc_date");
include_ecrire ("inc_abstract_sql");
include_ecrire ("inc_config");
-function sites_dist()
+function exec_sites_dist()
{
global
$analyser_site,
diff --git a/ecrire/exec/sites_edit.php b/ecrire/exec/sites_edit.php
index 2946f5476b..54e1c6901f 100644
--- a/ecrire/exec/sites_edit.php
+++ b/ecrire/exec/sites_edit.php
@@ -13,7 +13,7 @@
if (!defined("_ECRIRE_INC_VERSION")) return;
include_ecrire("inc_presentation");
-function sites_edit_dist()
+function exec_sites_edit_dist()
{
global $champs_extra, $connect_statut, $descriptif, $id_rubrique, $id_secteur, $id_syndic, $new, $nom_site, $syndication, $url_site, $url_syndic;
diff --git a/ecrire/exec/sites_tous.php b/ecrire/exec/sites_tous.php
index f80a3dcd2a..36a9106c76 100644
--- a/ecrire/exec/sites_tous.php
+++ b/ecrire/exec/sites_tous.php
@@ -15,7 +15,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
include_ecrire("inc_presentation");
include_ecrire("inc_sites_voir");
-function sites_tous_dist()
+function exec_sites_tous_dist()
{
global $connect_statut, $supp_syndic, $options;
diff --git a/ecrire/exec/statistiques_lang.php b/ecrire/exec/statistiques_lang.php
index ee0ec0b2a7..a81fba22ff 100644
--- a/ecrire/exec/statistiques_lang.php
+++ b/ecrire/exec/statistiques_lang.php
@@ -14,7 +14,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
include_ecrire("inc_presentation");
-function statistiques_lang_dist()
+function exec_statistiques_lang_dist()
{
global $connect_statut, $couleur_foncee, $critere, $spip_ecran, $spip_lang_right;
diff --git a/ecrire/exec/statistiques_referers.php b/ecrire/exec/statistiques_referers.php
index c8b59a2069..ca54c9db04 100644
--- a/ecrire/exec/statistiques_referers.php
+++ b/ecrire/exec/statistiques_referers.php
@@ -15,7 +15,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
include_ecrire("inc_presentation");
include_ecrire("inc_statistiques");
-function statistiques_referers_dist()
+function exec_statistiques_referers_dist()
{
global $connect_statut, $id_article, $jour, $limit;
diff --git a/ecrire/exec/statistiques_repartition.php b/ecrire/exec/statistiques_repartition.php
index 75be48a599..50f5514c55 100644
--- a/ecrire/exec/statistiques_repartition.php
+++ b/ecrire/exec/statistiques_repartition.php
@@ -125,7 +125,7 @@ function enfants_aff($id_parent,$decalage, $critere, $gauche=0) {
}
}
-function statistiques_repartition_dist()
+function exec_statistiques_repartition_dist()
{
global $connect_statut, $connect_toutes_rubriques, $spip_ecran, $taille,
diff --git a/ecrire/exec/statistiques_svg.php b/ecrire/exec/statistiques_svg.php
index 856839f66e..26d1145a68 100644
--- a/ecrire/exec/statistiques_svg.php
+++ b/ecrire/exec/statistiques_svg.php
@@ -14,7 +14,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
include_ecrire("inc_presentation");
-function statistiques_svg_dist()
+function exec_statistiques_svg_dist()
{
global
$aff_jours,
diff --git a/ecrire/exec/statistiques_visites.php b/ecrire/exec/statistiques_visites.php
index c0509533cc..573a322e8c 100644
--- a/ecrire/exec/statistiques_visites.php
+++ b/ecrire/exec/statistiques_visites.php
@@ -35,7 +35,7 @@ function http_img_rien($width, $height, $style='', $title='') {
. (!$title ? '' : (" title=\"$title\"")));
}
-function statistiques_visites_dist()
+function exec_statistiques_visites_dist()
{
global
$aff_jours,
diff --git a/ecrire/exec/suivi_revisions.php b/ecrire/exec/suivi_revisions.php
index 5a014e5e33..82a4a007c7 100644
--- a/ecrire/exec/suivi_revisions.php
+++ b/ecrire/exec/suivi_revisions.php
@@ -15,7 +15,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
include_ecrire("inc_presentation");
include_ecrire("inc_suivi_versions");
-function suivi_revisions_dist()
+function exec_suivi_revisions_dist()
{
global
$connect_id_auteur,
diff --git a/ecrire/exec/synchro.php b/ecrire/exec/synchro.php
index a2bd87a77a..41207b7867 100644
--- a/ecrire/exec/synchro.php
+++ b/ecrire/exec/synchro.php
@@ -30,7 +30,7 @@ function afficher_liens_calendrier($lien, $icone, $texte) {
echo fin_cadre_enfonce();
}
-function synchro_dist()
+function exec_synchro_dist()
{
global $connect_id_auteur;
///// debut de la page
diff --git a/ecrire/exec/upgrade.php b/ecrire/exec/upgrade.php
index 7b4039a001..8a7bb793dc 100644
--- a/ecrire/exec/upgrade.php
+++ b/ecrire/exec/upgrade.php
@@ -12,80 +12,80 @@
if (!defined("_ECRIRE_INC_VERSION")) return;
-function upgrade_dist()
-{
-
- global $connect_id_auteur, $spip_version, $reinstall;
-
- if (!_FILE_CONNECT) {
- header("Location: " . generer_url_ecrire("install"));
- exit;
- }
-
-// Si reinstallation necessaire, message ad hoc
- if ($reinstall == 'oui') {
-
- @copy(_FILE_CONNECT, _FILE_CONNECT_INS);
-
- install_debut_html(_T('titre_page_upgrade'));
- echo "<p><b>",_T('texte_nouvelle_version_spip_1'),"</b><p> ",
- _T('texte_nouvelle_version_spip_2',
- array('connect' => '<tt>' . _FILE_CONNECT . '</tt>')),
- "<p><div align='right'>",
- '<form action="', generer_url_ecrire("upgrade", 'reinstall=non'), '">',
- "<input type='submit' value=\"",
- _T('bouton_relancer_installation'),
- "\" class='fondl'>",
- "</form>\n";
- install_fin_html();
- exit;
- }
-
-// eviter les actions vides pour cause de fichier de langue inaccessible.
- $upgrade_titre = _T('info_mise_a_niveau_base') ;
- if (!$upgrade_titre) $upgrade_titre = 'info_mise_a_niveau_base';
-
-// Commentaire standard upgrade
- $commentaire = _T('texte_mise_a_niveau_base_1');
-
-// Verifier la version
- $version_installee = (double) str_replace(',','.',$GLOBALS['meta']['version_installee']);
+function exec_upgrade_dist() {
+
+ global $connect_id_auteur, $spip_version, $reinstall;
+
+ if (!_FILE_CONNECT)
+ redirige_par_entete(generer_url_ecrire("install"));
+
+ // Si reinstallation necessaire, message ad hoc
+ if ($reinstall == 'oui') {
+
+ @copy(_FILE_CONNECT, _FILE_CONNECT_INS);
+
+ install_debut_html(_T('titre_page_upgrade'));
+ echo "<p><b>",_T('texte_nouvelle_version_spip_1'),"</b><p> ",
+ _T('texte_nouvelle_version_spip_2',
+ array('connect' => '<tt>' . _FILE_CONNECT . '</tt>')),
+ "<p><div align='right'>",
+ '<form action="', generer_url_ecrire("upgrade", 'reinstall=non'),
+ '">', "<input type='submit' value=\"",
+ _T('bouton_relancer_installation'),
+ "\" class='fondl'>",
+ "</form>\n";
+
+ install_fin_html();
+ exit;
+ }
+
+ // eviter les actions vides pour cause de fichier de langue inaccessible.
+ $upgrade_titre = _T('info_mise_a_niveau_base') ;
+ if (!$upgrade_titre) $upgrade_titre = 'info_mise_a_niveau_base';
+
+ // Commentaire standard upgrade
+ $commentaire = _T('texte_mise_a_niveau_base_1');
+
+ // Verifier la version
+ $version_installee = (double) str_replace(',','.',$GLOBALS['meta']['version_installee']);
# NB: str_replace car, sur club-internet, il semble que version_installe soit
# enregistree au format '1,812' et non '1.812'
-// Erreur downgrade (cas de double installation de fichiers SPIP sur une meme base)
- if ($spip_version < $version_installee)
- $commentaire = _T('info_mise_a_niveau_base_2');
+ // Erreur downgrade
+ // (cas de double installation de fichiers SPIP sur une meme base)
+ if ($spip_version < $version_installee)
+ $commentaire = _T('info_mise_a_niveau_base_2');
- // Qu'est-ce que tu fais ici?
- if ($spip_version == $version_installee) {
- @header("Location: ./");
- exit;
- }
+ // Qu'est-ce que tu fais ici?
+ if ($spip_version == $version_installee)
+ redirige_par_entete('./');
- include_ecrire('inc_admin');
+ // On passe a l'upgrade
+ include_ecrire('inc_admin');
- debut_admin(generer_url_post_ecrire("upgrade"),$upgrade_titre, $commentaire);
+ debut_admin(generer_url_post_ecrire("upgrade"),
+ $upgrade_titre, $commentaire);
- include_ecrire ("inc_base");
+ include_ecrire ("inc_base");
+ creer_base();
+ $ok = maj_base();
- creer_base();
- $ok = maj_base();
+ if ($ok) {
+ include_ecrire ("inc_acces");
+ include_ecrire ("inc_config");
+ ecrire_acces();
+ init_config();
+ }
- if ($ok) {
- include_ecrire ("inc_acces");
- include_ecrire ("inc_config");
- ecrire_acces();
- init_config();
- }
+ fin_admin($upgrade_titre);
- fin_admin($upgrade_titre);
+ if ($ok)
+ redirige_par_entete(generer_action_auteur('purger', 'cache',
+ _DIR_RESTREINT_ABS, true));
- if ($ok) {
- redirige_par_entete(generer_action_auteur('purger', 'cache', _DIR_RESTREINT_ABS, true));
- }
- else {
- echo _T('alerte_maj_impossible', array('version' => $spip_version));
- }
+ else {
+ echo _T('alerte_maj_impossible', array('version' => $spip_version));
+ }
}
+
?>
diff --git a/ecrire/inc_admin.php b/ecrire/inc_admin.php
index 6fb347a17d..75762b3aff 100644
--- a/ecrire/inc_admin.php
+++ b/ecrire/inc_admin.php
@@ -60,8 +60,7 @@ function fin_admin($action) {
}
-function demande_maj_version()
-{
+function demande_maj_version() {
include_ecrire("inc_presentation");
debut_page();
echo "<blockquote><blockquote><h4><font color='red'>",
@@ -76,4 +75,5 @@ function demande_maj_version()
fin_page();
exit;
}
+
?>
diff --git a/ecrire/inc_utils.php b/ecrire/inc_utils.php
index 415ffaeb97..01ceacb10b 100644
--- a/ecrire/inc_utils.php
+++ b/ecrire/inc_utils.php
@@ -52,21 +52,36 @@ function include_ecrire($file, $silence=false) {
return include_local(_DIR_INCLUDE . $file, $silence);
}
-// charge un fichier perso ou, a defaut, standard
-// et retourne si elle existe le nom de la fonction homonyme, ou de suffixe _dist
+// charge un fichier perso ou, a defaut, standard
+// et retourne si elle existe le nom de la fonction homonyme (exec_$nom),
+// ou de suffixe _dist
function include_fonction($nom, $dossier='exec') {
- if(!preg_match(',^[a-z0-9_-]+$,', $nom)) return;
+
+ // Securite de base
+ if (!preg_match(',^[a-z0-9_-]+$,', $nom))
+ redirige_par_entete('./');
+
+ // Si la fonction existe deja (definie par mes_options, par exemple)
+ if (function_exists($f = $dossier.'_'.$nom))
+ return $f;
+
+ // Sinon charger le fichier de declaration
$inc = include_spip($dossier.'/'.$nom);
- if (function_exists($nom))
- return $nom;
- elseif (function_exists($f = $nom . "_dist"))
+ if (function_exists($f = $dossier.'_'.$nom) # definition perso ?
+ OR function_exists($f = $dossier.'_'.$nom.'_dist')) # definition standard
return $f;
- else {
- spip_log("fonction $nom indisponible" .
- ($inc ? "" : "(fichier $dossier/$nom absent)"));
- exit;
- }
+
+ // Echec : message d'erreur
+ spip_log("fonction $nom indisponible" .
+ ($inc ? "" : "(fichier $dossier/$nom absent)"));
+
+ include_ecrire('inc_minipres');
+ install_debut_html(_T('forum_titre_erreur'));
+ echo '<p>' . _T('fichier_introuvable',
+ array('fichier'=> '<b>'.htmlentities("$dossier/$nom").'</b>'));
+ install_fin_html();
+ exit;
}
//
diff --git a/ecrire/index.php b/ecrire/index.php
index 5ce716f326..d6bb9e8f49 100644
--- a/ecrire/index.php
+++ b/ecrire/index.php
@@ -23,11 +23,11 @@ if (!preg_match(',^[a-z][0-9a-z_]*$,i', $exec)) $exec = "accueil";
$var_auth ="";
if (autoriser_sans_cookie($exec)) {
if (!isset($reinstall)) $reinstall = 'non';
- } else {
+} else {
include_ecrire ("inc_session");
$var_auth = include_fonction('auth');
if (!$var_auth()) exit;
- }
+}
//
// Preferences de presentation
@@ -147,16 +147,14 @@ if ($spip_lang_ecrire = $GLOBALS['_COOKIE']['spip_lang_ecrire']) {
//
if (!isset($reinstall)) {
-
if ($spip_version <> ((double) str_replace(',','.',$GLOBALS['meta']['version_installee']))) {
-
- include_ecrire('inc_admin');
- demande_maj_version();
+ include_ecrire('inc_admin');
+ demande_maj_version();
}
- }
+}
//
-// Controle d' interruption d'une longue restauration
+// Controle d'interruption d'une longue restauration
//
if ($GLOBALS['_COOKIE']['spip_admin'] AND $GLOBALS['meta']["debut_restauration"])
$exec = 'import_all';
diff --git a/ecrire/public.php b/ecrire/public.php
index 00661167b5..54fda0a656 100644
--- a/ecrire/public.php
+++ b/ecrire/public.php
@@ -109,8 +109,8 @@ if (defined("_INC_PUBLIC")) {
// Valider/indenter a la demande. garder la compatibilite tidy
if (trim($page) AND $xhtml AND $html AND !headers_sent()) {
- $f = include_fonction(($xhtml === true) ? 'tidy' : $xhtml);
- $page = $f($page);
+ if ($f = include_fonction(($xhtml === true) ? 'tidy' : $xhtml))
+ $page = $f($page);
}
// Inserer au besoin les boutons admins
--
GitLab