From 02f5bfdc196646dac69bb4b96117a6c3cb77d28b Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Sun, 18 Dec 2005 16:01:40 +0000
Subject: [PATCH] simplification de l'API d'appel des script de ecrire/
---
ecrire/admin_effacer.php3 | 2 --
ecrire/admin_index.php3 | 2 --
ecrire/admin_tech.php3 | 2 --
ecrire/admin_vider.php3 | 2 --
ecrire/aide_index.php3 | 2 --
ecrire/ajax_page.php | 2 --
ecrire/articles.php3 | 2 --
ecrire/articles_edit.php3 | 2 --
ecrire/articles_forum.php3 | 2 --
ecrire/articles_ortho.php | 2 --
ecrire/articles_page.php3 | 2 --
ecrire/articles_tous.php3 | 2 --
ecrire/articles_versions.php3 | 2 --
ecrire/auteur_infos.php3 | 2 --
ecrire/auteurs.php3 | 2 --
ecrire/auteurs_edit.php3 | 2 --
ecrire/breves.php3 | 2 --
ecrire/breves_edit.php3 | 2 --
ecrire/breves_voir.php3 | 2 --
ecrire/brouteur.php3 | 2 --
ecrire/brouteur_frame.php3 | 2 --
ecrire/calendrier.php3 | 2 --
ecrire/calendrier_jour.php3 | 3 +--
ecrire/calendrier_semaine.php3 | 3 +--
ecrire/config-contenu.php3 | 2 --
ecrire/config-fonctions.php3 | 2 --
ecrire/config-lang.php3 | 2 --
ecrire/config-multilang.php3 | 2 --
ecrire/configuration.php3 | 2 --
ecrire/controle_forum.php3 | 2 --
ecrire/controle_petition.php3 | 2 --
ecrire/delete_all.php3 | 2 --
ecrire/documents_liste.php3 | 2 --
ecrire/export.php3 | 2 --
ecrire/export_all.php3 | 2 --
ecrire/forum.php3 | 3 +--
ecrire/forum_admin.php3 | 2 --
ecrire/forum_envoi.php3 | 2 --
ecrire/iframe_action.php3 | 2 --
ecrire/import_all.php3 | 2 --
ecrire/inc.php3 | 4 ++++
ecrire/inc_version.php3 | 2 ++
ecrire/index.php3 | 3 +--
ecrire/info.php3 | 2 --
ecrire/install.php3 | 2 --
ecrire/js_menu_rubriques.php | 2 --
ecrire/lang_raccourcis.php3 | 2 --
ecrire/message.php3 | 2 --
ecrire/message_edit.php3 | 2 --
ecrire/messagerie.php3 | 2 --
ecrire/mots_edit.php3 | 2 --
ecrire/mots_tous.php3 | 2 --
ecrire/mots_type.php3 | 2 --
ecrire/naviguer.php3 | 2 --
ecrire/recherche.php3 | 2 --
ecrire/rubriques_edit.php3 | 2 --
ecrire/sites.php3 | 2 --
ecrire/sites_edit.php3 | 2 --
ecrire/sites_tous.php3 | 2 --
ecrire/statistiques_lang.php3 | 2 --
ecrire/statistiques_referers.php3 | 2 --
ecrire/statistiques_repartition.php | 2 --
ecrire/statistiques_svg.php3 | 2 --
ecrire/statistiques_visites.php3 | 2 --
ecrire/suivi_revisions.php3 | 2 --
ecrire/synchro.php3 | 2 --
ecrire/unpack.php3 | 3 +--
ecrire/upgrade.php3 | 2 --
68 files changed, 11 insertions(+), 132 deletions(-)
diff --git a/ecrire/admin_effacer.php3 b/ecrire/admin_effacer.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/admin_effacer.php3
+++ b/ecrire/admin_effacer.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/admin_index.php3 b/ecrire/admin_index.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/admin_index.php3
+++ b/ecrire/admin_index.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/admin_tech.php3 b/ecrire/admin_tech.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/admin_tech.php3
+++ b/ecrire/admin_tech.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/admin_vider.php3 b/ecrire/admin_vider.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/admin_vider.php3
+++ b/ecrire/admin_vider.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/aide_index.php3 b/ecrire/aide_index.php3
index 01143902a1..c31c95b353 100644
--- a/ecrire/aide_index.php3
+++ b/ecrire/aide_index.php3
@@ -12,6 +12,4 @@
define('_ECRIRE_AIDE', 1);
include ("inc_version.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/ajax_page.php b/ecrire/ajax_page.php
index 1c2e73147b..52a1cde891 100644
--- a/ecrire/ajax_page.php
+++ b/ecrire/ajax_page.php
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, '.php'));
-$var_f();
?>
diff --git a/ecrire/articles.php3 b/ecrire/articles.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/articles.php3
+++ b/ecrire/articles.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/articles_edit.php3 b/ecrire/articles_edit.php3
index 34223917ab..52a1cde891 100644
--- a/ecrire/articles_edit.php3
+++ b/ecrire/articles_edit.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f(intval($id_article), intval($id_rubrique), intval($lier_trad), $new);
?>
diff --git a/ecrire/articles_forum.php3 b/ecrire/articles_forum.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/articles_forum.php3
+++ b/ecrire/articles_forum.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/articles_ortho.php b/ecrire/articles_ortho.php
index 1c2e73147b..52a1cde891 100644
--- a/ecrire/articles_ortho.php
+++ b/ecrire/articles_ortho.php
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, '.php'));
-$var_f();
?>
diff --git a/ecrire/articles_page.php3 b/ecrire/articles_page.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/articles_page.php3
+++ b/ecrire/articles_page.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/articles_tous.php3 b/ecrire/articles_tous.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/articles_tous.php3
+++ b/ecrire/articles_tous.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/articles_versions.php3 b/ecrire/articles_versions.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/articles_versions.php3
+++ b/ecrire/articles_versions.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/auteur_infos.php3 b/ecrire/auteur_infos.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/auteur_infos.php3
+++ b/ecrire/auteur_infos.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/auteurs.php3 b/ecrire/auteurs.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/auteurs.php3
+++ b/ecrire/auteurs.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/auteurs_edit.php3 b/ecrire/auteurs_edit.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/auteurs_edit.php3
+++ b/ecrire/auteurs_edit.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/breves.php3 b/ecrire/breves.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/breves.php3
+++ b/ecrire/breves.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/breves_edit.php3 b/ecrire/breves_edit.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/breves_edit.php3
+++ b/ecrire/breves_edit.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/breves_voir.php3 b/ecrire/breves_voir.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/breves_voir.php3
+++ b/ecrire/breves_voir.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/brouteur.php3 b/ecrire/brouteur.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/brouteur.php3
+++ b/ecrire/brouteur.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/brouteur_frame.php3 b/ecrire/brouteur_frame.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/brouteur_frame.php3
+++ b/ecrire/brouteur_frame.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/calendrier.php3 b/ecrire/calendrier.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/calendrier.php3
+++ b/ecrire/calendrier.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/calendrier_jour.php3 b/ecrire/calendrier_jour.php3
index 802957b537..4f93e01b8e 100644
--- a/ecrire/calendrier_jour.php3
+++ b/ecrire/calendrier_jour.php3
@@ -12,7 +12,6 @@
// obsolete, mais assurer le service pour les vieux liens
if (!isset($_GET['type'])) $type = 'jour';
+$SCRIPT_NAME = 'calendrier.php3';
include ("inc.php3");
-$var_f = include_fonction('calendrier');
-$var_f();
?>
diff --git a/ecrire/calendrier_semaine.php3 b/ecrire/calendrier_semaine.php3
index 4948221a8c..e45b64b3aa 100644
--- a/ecrire/calendrier_semaine.php3
+++ b/ecrire/calendrier_semaine.php3
@@ -12,7 +12,6 @@
// obsolete, mais assurer le service pour les vieux liens
if (!isset($_GET['type'])) $type = 'semaine';
+$SCRIPT_NAME = 'calendrier.php3';
include ("inc.php3");
-$var_f = include_fonction('calendrier');
-$var_f();
?>
diff --git a/ecrire/config-contenu.php3 b/ecrire/config-contenu.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/config-contenu.php3
+++ b/ecrire/config-contenu.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/config-fonctions.php3 b/ecrire/config-fonctions.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/config-fonctions.php3
+++ b/ecrire/config-fonctions.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/config-lang.php3 b/ecrire/config-lang.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/config-lang.php3
+++ b/ecrire/config-lang.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/config-multilang.php3 b/ecrire/config-multilang.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/config-multilang.php3
+++ b/ecrire/config-multilang.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/configuration.php3 b/ecrire/configuration.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/configuration.php3
+++ b/ecrire/configuration.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/controle_forum.php3 b/ecrire/controle_forum.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/controle_forum.php3
+++ b/ecrire/controle_forum.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/controle_petition.php3 b/ecrire/controle_petition.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/controle_petition.php3
+++ b/ecrire/controle_petition.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/delete_all.php3 b/ecrire/delete_all.php3
index 9540eeeaa1..0a80450eaa 100644
--- a/ecrire/delete_all.php3
+++ b/ecrire/delete_all.php3
@@ -12,6 +12,4 @@
$reinstall = 'non';
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/documents_liste.php3 b/ecrire/documents_liste.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/documents_liste.php3
+++ b/ecrire/documents_liste.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/export.php3 b/ecrire/export.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/export.php3
+++ b/ecrire/export.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/export_all.php3 b/ecrire/export_all.php3
index 9540eeeaa1..0a80450eaa 100644
--- a/ecrire/export_all.php3
+++ b/ecrire/export_all.php3
@@ -12,6 +12,4 @@
$reinstall = 'non';
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/forum.php3 b/ecrire/forum.php3
index 8b41f8b379..a3650a15fb 100644
--- a/ecrire/forum.php3
+++ b/ecrire/forum.php3
@@ -11,7 +11,6 @@
\***************************************************************************/
// obsolete, mais assurer le service pour les vieux liens
+$SCRIPT_NAME = 'forum_admin.php3';
include ("inc.php3");
-$var_f = include_fonction('forum_admin');
-$var_f();
?>
diff --git a/ecrire/forum_admin.php3 b/ecrire/forum_admin.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/forum_admin.php3
+++ b/ecrire/forum_admin.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/forum_envoi.php3 b/ecrire/forum_envoi.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/forum_envoi.php3
+++ b/ecrire/forum_envoi.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/iframe_action.php3 b/ecrire/iframe_action.php3
index 9540eeeaa1..0a80450eaa 100644
--- a/ecrire/iframe_action.php3
+++ b/ecrire/iframe_action.php3
@@ -12,6 +12,4 @@
$reinstall = 'non';
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/import_all.php3 b/ecrire/import_all.php3
index 9540eeeaa1..0a80450eaa 100644
--- a/ecrire/import_all.php3
+++ b/ecrire/import_all.php3
@@ -12,6 +12,4 @@
$reinstall = 'non';
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/inc.php3 b/ecrire/inc.php3
index bdaa543e36..772acc8d3d 100644
--- a/ecrire/inc.php3
+++ b/ecrire/inc.php3
@@ -136,4 +136,8 @@ if (!isset($reinstall)) {
demande_maj_version();
}
}
+
+$var_f = include_fonction($SCRIPT_NAME);
+$var_f();
+
?>
diff --git a/ecrire/inc_version.php3 b/ecrire/inc_version.php3
index 74d28617ea..a98fe4d587 100644
--- a/ecrire/inc_version.php3
+++ b/ecrire/inc_version.php3
@@ -61,6 +61,8 @@ function include_ecrire($file) {
function include_fonction($nom) {
# Hack pour etre compatible avec les mes_options qui appellent cette fonction
define_once('_DIR_INCLUDE', _DIR_RESTREINT);
+
+ $nom = preg_replace("/\.php3?$/",'', basename($nom));
$inc = ('inc_' . $nom . '.php');
$f = find_in_path($inc);
if ($f && is_readable($f)) {
diff --git a/ecrire/index.php3 b/ecrire/index.php3
index 0dca566571..df1d9900ab 100644
--- a/ecrire/index.php3
+++ b/ecrire/index.php3
@@ -10,7 +10,6 @@
* Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne. *
\***************************************************************************/
+$SCRIPT_NAME = 'accueil.php3';
include ("inc.php3");
-$var_f = include_fonction('accueil');
-$var_f();
?>
diff --git a/ecrire/info.php3 b/ecrire/info.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/info.php3
+++ b/ecrire/info.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/install.php3 b/ecrire/install.php3
index 522ae28743..5a16db003d 100644
--- a/ecrire/install.php3
+++ b/ecrire/install.php3
@@ -12,6 +12,4 @@
define("_ECRIRE_INSTALL", "1");
include ("inc_version.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/js_menu_rubriques.php b/ecrire/js_menu_rubriques.php
index 1c2e73147b..52a1cde891 100644
--- a/ecrire/js_menu_rubriques.php
+++ b/ecrire/js_menu_rubriques.php
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, '.php'));
-$var_f();
?>
diff --git a/ecrire/lang_raccourcis.php3 b/ecrire/lang_raccourcis.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/lang_raccourcis.php3
+++ b/ecrire/lang_raccourcis.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/message.php3 b/ecrire/message.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/message.php3
+++ b/ecrire/message.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/message_edit.php3 b/ecrire/message_edit.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/message_edit.php3
+++ b/ecrire/message_edit.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/messagerie.php3 b/ecrire/messagerie.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/messagerie.php3
+++ b/ecrire/messagerie.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/mots_edit.php3 b/ecrire/mots_edit.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/mots_edit.php3
+++ b/ecrire/mots_edit.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/mots_tous.php3 b/ecrire/mots_tous.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/mots_tous.php3
+++ b/ecrire/mots_tous.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/mots_type.php3 b/ecrire/mots_type.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/mots_type.php3
+++ b/ecrire/mots_type.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/naviguer.php3 b/ecrire/naviguer.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/naviguer.php3
+++ b/ecrire/naviguer.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/recherche.php3 b/ecrire/recherche.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/recherche.php3
+++ b/ecrire/recherche.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/rubriques_edit.php3 b/ecrire/rubriques_edit.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/rubriques_edit.php3
+++ b/ecrire/rubriques_edit.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/sites.php3 b/ecrire/sites.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/sites.php3
+++ b/ecrire/sites.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/sites_edit.php3 b/ecrire/sites_edit.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/sites_edit.php3
+++ b/ecrire/sites_edit.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/sites_tous.php3 b/ecrire/sites_tous.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/sites_tous.php3
+++ b/ecrire/sites_tous.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/statistiques_lang.php3 b/ecrire/statistiques_lang.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/statistiques_lang.php3
+++ b/ecrire/statistiques_lang.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/statistiques_referers.php3 b/ecrire/statistiques_referers.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/statistiques_referers.php3
+++ b/ecrire/statistiques_referers.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/statistiques_repartition.php b/ecrire/statistiques_repartition.php
index 1c2e73147b..52a1cde891 100644
--- a/ecrire/statistiques_repartition.php
+++ b/ecrire/statistiques_repartition.php
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, '.php'));
-$var_f();
?>
diff --git a/ecrire/statistiques_svg.php3 b/ecrire/statistiques_svg.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/statistiques_svg.php3
+++ b/ecrire/statistiques_svg.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/statistiques_visites.php3 b/ecrire/statistiques_visites.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/statistiques_visites.php3
+++ b/ecrire/statistiques_visites.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/suivi_revisions.php3 b/ecrire/suivi_revisions.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/suivi_revisions.php3
+++ b/ecrire/suivi_revisions.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/synchro.php3 b/ecrire/synchro.php3
index 2fe0d69a9d..52a1cde891 100644
--- a/ecrire/synchro.php3
+++ b/ecrire/synchro.php3
@@ -11,6 +11,4 @@
\***************************************************************************/
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
diff --git a/ecrire/unpack.php3 b/ecrire/unpack.php3
index 5ffb363147..38bd0db042 100644
--- a/ecrire/unpack.php3
+++ b/ecrire/unpack.php3
@@ -12,7 +12,6 @@
$reinstall = 'non';
$etape = 'unpack';
+$SCRIPT_NAME = 'install.php3';
include ("inc.php3");
-$var_f = include_fonction('install');
-$var_f();
?>
diff --git a/ecrire/upgrade.php3 b/ecrire/upgrade.php3
index 54345a22b4..af95c5daae 100644
--- a/ecrire/upgrade.php3
+++ b/ecrire/upgrade.php3
@@ -12,6 +12,4 @@
if (!isset($reinstall)) $reinstall = 'non';
include ("inc.php3");
-$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
-$var_f();
?>
--
GitLab