From d2a1edfdb38091498b2a178455b833939ac8cecf Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Thu, 10 Nov 2005 20:15:09 +0000
Subject: [PATCH] Suite de la rationnalisation des includes: transparent, mais
plus propre
---
ecrire/aide_index.php3 | 2 +-
ecrire/articles.php3 | 2 +-
ecrire/articles_edit.php3 | 2 +-
ecrire/articles_page.php3 | 2 +-
ecrire/auteur_infos.php3 | 2 +-
ecrire/auteurs_edit.php3 | 2 +-
ecrire/breves.php3 | 2 +-
ecrire/calendrier.php3 | 2 +-
ecrire/config-fonctions.php3 | 2 +-
ecrire/controle_forum.php3 | 2 +-
ecrire/export.php3 | 2 +-
ecrire/forum_admin.php3 | 2 +-
ecrire/iframe_action.php3 | 2 +-
ecrire/inc.php3 | 2 +-
ecrire/js_menu_rubriques.php | 2 +-
ecrire/messagerie.php3 | 2 +-
ecrire/naviguer.php3 | 2 +-
ecrire/statistiques_repartition.php | 2 +-
ecrire/synchro.php3 | 2 +-
19 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/ecrire/aide_index.php3 b/ecrire/aide_index.php3
index 1f676fdde5..02cc7ed5b5 100644
--- a/ecrire/aide_index.php3
+++ b/ecrire/aide_index.php3
@@ -17,7 +17,7 @@ $nom = "aide_index";
$f = find_in_path('inc_' . $nom . '.php');
if ($f)
include($f);
- else include_ecrire(_DIR_INCLUDE . 'inc_' . $nom . '.php');
+ else include_ecrire('inc_' . $nom . '.php');
if (function_exists($nom))
$nom($img, $frame, $aide, $var_lang, $lang);
diff --git a/ecrire/articles.php3 b/ecrire/articles.php3
index 5f2356f8c9..c4313a56c8 100644
--- a/ecrire/articles.php3
+++ b/ecrire/articles.php3
@@ -17,7 +17,7 @@ $var_f = find_in_path("inc_articles.php");
if ($var_f)
include($var_f);
else
- include_ecrire(_DIR_INCLUDE . "inc_articles.php");
+ include_ecrire("inc_articles.php");
$articles_surtitre = lire_meta("articles_surtitre");
$articles_soustitre = lire_meta("articles_soustitre");
diff --git a/ecrire/articles_edit.php3 b/ecrire/articles_edit.php3
index a12ee049c3..ffc2fe5b2b 100644
--- a/ecrire/articles_edit.php3
+++ b/ecrire/articles_edit.php3
@@ -16,7 +16,7 @@ $var_f = find_in_path("inc_articles_edit.php");
if ($var_f)
include($var_f);
else
- include_ecrire(_DIR_INCLUDE . "inc_articles_edit.php");
+ include_ecrire("inc_articles_edit.php");
// securite
diff --git a/ecrire/articles_page.php3 b/ecrire/articles_page.php3
index 91fe980ac2..f4b06e19ea 100644
--- a/ecrire/articles_page.php3
+++ b/ecrire/articles_page.php3
@@ -21,7 +21,7 @@ $var_f = find_in_path('inc_' . $var_nom . '.php');
if ($var_f)
include($var_f);
else
- include_ecrire(_DIR_INCLUDE . 'inc_' . $var_nom . '.php');
+ include_ecrire('inc_' . $var_nom . '.php');
if (function_exists($var_nom))
$var_nom($connect_id_auteur);
diff --git a/ecrire/auteur_infos.php3 b/ecrire/auteur_infos.php3
index 8f5f35064d..fc029f6d09 100644
--- a/ecrire/auteur_infos.php3
+++ b/ecrire/auteur_infos.php3
@@ -16,7 +16,7 @@ $var_f = find_in_path("inc_auteur_infos.php");
if ($var_f)
include($var_f);
else
- include_ecrire(_DIR_INCLUDE . "inc_auteur_infos.php");
+ include_ecrire("inc_auteur_infos.php");
// securite
$id_auteur = floor($id_auteur);
diff --git a/ecrire/auteurs_edit.php3 b/ecrire/auteurs_edit.php3
index 1219105a8b..de6661a5ba 100644
--- a/ecrire/auteurs_edit.php3
+++ b/ecrire/auteurs_edit.php3
@@ -20,7 +20,7 @@ $var_f = find_in_path('inc_' . $var_nom . '.php');
if ($var_f)
include($var_f);
else
- include_ecrire(_DIR_INCLUDE . 'inc_' . $var_nom . '.php');
+ include_ecrire('inc_' . $var_nom . '.php');
if (function_exists($var_nom))
$var_nom($id_auteur);
diff --git a/ecrire/breves.php3 b/ecrire/breves.php3
index 288a6c82da..cc5b8c682c 100644
--- a/ecrire/breves.php3
+++ b/ecrire/breves.php3
@@ -21,7 +21,7 @@ $var_f = find_in_path('inc_' . $var_nom . '.php');
if ($var_f)
include($var_f);
else
- include_ecrire(_DIR_INCLUDE . 'inc_' . $var_nom . '.php');
+ include_ecrire('inc_' . $var_nom . '.php');
if (function_exists($var_nom))
$var_nom();
diff --git a/ecrire/calendrier.php3 b/ecrire/calendrier.php3
index 3ca0dd71ea..7c390218b2 100644
--- a/ecrire/calendrier.php3
+++ b/ecrire/calendrier.php3
@@ -21,7 +21,7 @@ $var_f = find_in_path('inc_' . $var_nom . '.php');
if ($var_f)
include($var_f);
else
- include_ecrire(_DIR_INCLUDE . 'inc_' . $var_nom . '.php');
+ include_ecrire('inc_' . $var_nom . '.php');
if (function_exists($var_nom))
$var_nom($type, $css);
diff --git a/ecrire/config-fonctions.php3 b/ecrire/config-fonctions.php3
index dabea6c925..2c63d65bd5 100644
--- a/ecrire/config-fonctions.php3
+++ b/ecrire/config-fonctions.php3
@@ -16,7 +16,7 @@ $var_f = find_in_path("inc_config-fonctions.php");
if ($var_f)
include($var_f);
else
- include_ecrire(_DIR_INCLUDE . "inc_config-fonctions.php"));
+ include_ecrire("inc_config-fonctions.php"));
if ($connect_statut != '0minirezo' OR !$connect_toutes_rubriques) {
echo _T('avis_non_acces_page');
diff --git a/ecrire/controle_forum.php3 b/ecrire/controle_forum.php3
index c076d802e2..1c5d8df639 100644
--- a/ecrire/controle_forum.php3
+++ b/ecrire/controle_forum.php3
@@ -17,7 +17,7 @@ $nom = "controle_forum";
$f = find_in_path('inc_' . $nom . '.php');
if ($f)
include($f);
-else include_ecrire(_DIR_INCLUDE . 'inc_' . $nom . '.php');
+else include_ecrire('inc_' . $nom . '.php');
if (function_exists($nom))
$nom($page, $debut, $debut_id_forum, $id_rubrique);
diff --git a/ecrire/export.php3 b/ecrire/export.php3
index 8c5cd79b8c..c659617e33 100644
--- a/ecrire/export.php3
+++ b/ecrire/export.php3
@@ -21,7 +21,7 @@ if ($var_f)
include($var_f);
// ATTENTION PHP3 ici
else
- include_ecrire(_DIR_INCLUDE . 'inc_' . $var_nom . '.php3');
+ include_ecrire('inc_' . $var_nom . '.php3');
if (function_exists($var_nom))
$var_nom($id_rubrique, $maj);
diff --git a/ecrire/forum_admin.php3 b/ecrire/forum_admin.php3
index 2ab2e036d3..2a58ef5c2f 100644
--- a/ecrire/forum_admin.php3
+++ b/ecrire/forum_admin.php3
@@ -21,7 +21,7 @@ $var_f = find_in_path('inc_' . $var_nom . '.php');
if ($var_f)
include($var_f);
else
- include_ecrire(_DIR_INCLUDE . 'inc_' . $var_nom . '.php');
+ include_ecrire('inc_' . $var_nom . '.php');
if (function_exists($var_nom))
$var_nom($debut, $admin);
diff --git a/ecrire/iframe_action.php3 b/ecrire/iframe_action.php3
index 76f3c8df24..24467f3c3a 100644
--- a/ecrire/iframe_action.php3
+++ b/ecrire/iframe_action.php3
@@ -19,7 +19,7 @@ if ($id && ($connect_statut == "0minirezo")) {
if ($var_f)
include($var_f);
else
- include_ecrire(_DIR_INCLUDE . 'inc_' . $action . '.php');
+ include_ecrire('inc_' . $action . '.php');
$var_nom = 'changer_statut_' . $action;
if (function_exists($var_nom))
diff --git a/ecrire/inc.php3 b/ecrire/inc.php3
index 9b7649bc42..4a65451c80 100644
--- a/ecrire/inc.php3
+++ b/ecrire/inc.php3
@@ -20,7 +20,7 @@ $var_f = find_in_path('inc_' . $var_nom . '.php');
if ($var_f)
include($var_f);
-else include_ecrire(_DIR_INCLUDE . 'inc_' . $var_nom . '.php3');
+else include_ecrire('inc_' . $var_nom . '.php3');
if (function_exists($var_nom))
$var_res = $var_nom();
diff --git a/ecrire/js_menu_rubriques.php b/ecrire/js_menu_rubriques.php
index ce43e448a5..1dc14a29f2 100644
--- a/ecrire/js_menu_rubriques.php
+++ b/ecrire/js_menu_rubriques.php
@@ -21,7 +21,7 @@ $var_f = find_in_path('inc_' . $var_nom . '.php');
if ($var_f)
include($var_f);
else
- include_ecrire(_DIR_INCLUDE . 'inc_' . $var_nom . '.php');
+ include_ecrire('inc_' . $var_nom . '.php');
if (function_exists($var_nom))
$var_nom();
diff --git a/ecrire/messagerie.php3 b/ecrire/messagerie.php3
index 6cc0901d3e..4cde5f9c2a 100644
--- a/ecrire/messagerie.php3
+++ b/ecrire/messagerie.php3
@@ -19,7 +19,7 @@ $var_f = find_in_path('inc_' . $var_nom . '.php');
if ($var_f)
include($var_f);
else
- include_ecrire(_DIR_INCLUDE . 'inc_' . $var_nom . '.php');
+ include_ecrire('inc_' . $var_nom . '.php');
if (function_exists($var_nom))
$var_res = $var_nom($id_message, $detruire_message, $supp_dest);
diff --git a/ecrire/naviguer.php3 b/ecrire/naviguer.php3
index bfa717356f..1a331c1ce7 100644
--- a/ecrire/naviguer.php3
+++ b/ecrire/naviguer.php3
@@ -20,7 +20,7 @@ $var_f = find_in_path('inc_' . $var_nom . '.php');
if ($var_f)
include($var_f);
else
- include_ecrire(_DIR_INCLUDE . 'inc_' . $var_nom . '.php');
+ include_ecrire('inc_' . $var_nom . '.php');
if (function_exists($var_nom))
$var_nom($action);
diff --git a/ecrire/statistiques_repartition.php b/ecrire/statistiques_repartition.php
index 712a134973..a9a44df21e 100644
--- a/ecrire/statistiques_repartition.php
+++ b/ecrire/statistiques_repartition.php
@@ -25,7 +25,7 @@ $var_f = find_in_path('inc_' . $var_nom . '.php');
if ($var_f)
include($var_f);
-else include_ecrire(_DIR_INCLUDE . 'inc_' . $var_nom . '.php');
+else include_ecrire('inc_' . $var_nom . '.php');
if (function_exists($var_nom))
$var_nom($critere);
diff --git a/ecrire/synchro.php3 b/ecrire/synchro.php3
index c2aeebd0de..b763972d35 100644
--- a/ecrire/synchro.php3
+++ b/ecrire/synchro.php3
@@ -20,7 +20,7 @@ $var_f = find_in_path('inc_' . $var_nom . '.php');
if ($var_f)
include($var_f);
else
- include_ecrire(_DIR_INCLUDE . 'inc_' . $var_nom . '.php');
+ include_ecrire('inc_' . $var_nom . '.php');
if (function_exists($var_nom))
$var_nom();
--
GitLab