diff --git a/ecrire/action/cookie.php b/ecrire/action/cookie.php
index a930d2c14f5c14fffb2c49a1bfa2c72c882f2fb6..78eb4520c24106eba6c65a8a61b4ad9da56365c8 100644
--- a/ecrire/action/cookie.php
+++ b/ecrire/action/cookie.php
@@ -144,7 +144,7 @@ if ($essai_login == "oui") {
if ($ldap_present) $auths[] = 'ldap';
$ok = false;
foreach ($auths as $nom_auth) {
- include_ecrire("inc_auth_".$nom_auth);
+ include_spip('inc/auth_'.$nom_auth);
$classe_auth = "Auth_".$nom_auth;
$auth = new $classe_auth;
if ($auth->init()) {
@@ -265,7 +265,7 @@ if (ereg("^Apache", $GLOBALS['SERVER_SOFTWARE'])) {
redirige_par_entete($redirect);
}
else {
- include_ecrire('inc_headers');
+ include_spip('inc/headers');
spip_header("Refresh: 0; url=" . $redirect);
echo "<html><head>";
echo "<meta http-equiv='Refresh' content='0; url=".$redirect."'>";
diff --git a/ecrire/action/ical.php b/ecrire/action/ical.php
index 630926120f29779103572c50aeffa5d8973c5897..31f427dd5c0a6ac0ccccdd005a2895ebb9d90d92 100644
--- a/ecrire/action/ical.php
+++ b/ecrire/action/ical.php
@@ -15,7 +15,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
include_spip('inc/minipres');
include_spip('inc/texte');
include_spip('inc/charsets');
-include_ecrire("inc_meta");
+include_spip('inc/meta');
include_spip('inc/acces');
// avec le nouveau compilateur tout ceci me semble faisable en squelette.
diff --git a/ecrire/action/inscription.php b/ecrire/action/inscription.php
index 2a52d1a07945e571f3110732b118148169d5a611..6f6a724d33e517b2b42f73e549e23fb78303689f 100644
--- a/ecrire/action/inscription.php
+++ b/ecrire/action/inscription.php
@@ -15,7 +15,7 @@ function action_inscription_dist() {
include_spip('inc-formulaire_inscription');
include_spip('public/global');
include_spip('inc/lang');
- include_ecrire('inc_headers');
+ include_spip('inc/headers');
utiliser_langue_site();
utiliser_langue_visiteur();
diff --git a/ecrire/action/tester.php b/ecrire/action/tester.php
index 548f7bb4ee6bff09df30eef5b8d5c22b9d22273a..8bf4a7dd3921e810b2c39a9fa27f53c70e7fb2cb 100644
--- a/ecrire/action/tester.php
+++ b/ecrire/action/tester.php
@@ -11,7 +11,7 @@
\***************************************************************************/
if (!defined("_ECRIRE_INC_VERSION")) return;
-include_ecrire("inc_meta");
+include_spip('inc/meta');
// Tester nos capacites
function action_tester_dist() {
diff --git a/ecrire/base/upgrade.php b/ecrire/base/upgrade.php
index a6a0cf9df2d152ddb0eb4e509766e2efad855dbe..98275a487d2d13b4aae39730434a1c8947f774fc 100644
--- a/ecrire/base/upgrade.php
+++ b/ecrire/base/upgrade.php
@@ -16,7 +16,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
function maj_version ($version, $test = true) {
if ($test) {
- include_ecrire('inc_meta');
+ include_spip('inc/meta');
ecrire_meta('version_installee', $version);
ecrire_metas();
spip_log("mise a jour de la base vers $version");
@@ -397,7 +397,7 @@ function maj_base() {
if ($version_installee < 1.414) {
// Forum par defaut "en dur" dans les spip_articles
// -> non, prio (priori), pos (posteriori), abo (abonnement)
- include_ecrire ("inc_meta");
+ include_spip('inc/meta');
$accepter_forum = substr($GLOBALS['meta']["forums_publics"],0,3) ;
$query = "ALTER TABLE spip_articles CHANGE accepter_forum accepter_forum CHAR(3) NOT NULL";
$result = spip_query($query);
@@ -422,7 +422,7 @@ function maj_base() {
$query = "SELECT * FROM spip_auteurs WHERE statut = '0minirezo' AND email != '' ORDER BY id_auteur LIMIT 1";
$result = spip_query($query);
if ($webmaster = spip_fetch_array($result)) {
- include_ecrire("inc_meta");
+ include_spip('inc/meta');
ecrire_meta('email_webmaster', $webmaster['email']);
ecrire_metas();
}
@@ -1135,7 +1135,7 @@ function maj_base() {
spip_query("INSERT INTO spip_index (hash,points,id_objet,id_table) SELECT hash,points,id_syndic as id_objet,'9' as id_table FROM spip_index_syndic");
spip_query("DROP TABLE IF EXISTS spip_index_syndic");
- include_ecrire('inc_meta');
+ include_spip('inc/meta');
lire_metas();
ecrire_metas();
diff --git a/ecrire/exec/admin_plugin.php b/ecrire/exec/admin_plugin.php
index 48ebf9e4a1a9325b721dea88c9c71d7a9f285776..6e9f976aff23d18bc1c9585cba30a1ff8801b28f 100644
--- a/ecrire/exec/admin_plugin.php
+++ b/ecrire/exec/admin_plugin.php
@@ -13,7 +13,7 @@
if (!defined("_ECRIRE_INC_VERSION")) return;
include_spip('inc/config');
-include_ecrire ("inc_plugin");
+include_spip('inc/plugin');
include_spip('inc/presentation');
include_spip('inc/layer');
diff --git a/ecrire/exec/convert_utf8.php b/ecrire/exec/convert_utf8.php
index 0b23b389fe6e1142a6c97720d56d0074e98a65fd..c3cdffc6a01fccce0175f22ffc477391d39abf23 100644
--- a/ecrire/exec/convert_utf8.php
+++ b/ecrire/exec/convert_utf8.php
@@ -71,7 +71,7 @@ function demander_conversion($tables_a_convertir, $action) {
}
function exec_convert_utf8_dist() {
- include_ecrire('inc_meta');
+ include_spip('inc/meta');
include_spip('inc/charsets');
lire_metas();
diff --git a/ecrire/exec/install.php b/ecrire/exec/install.php
index 12104cc9043685d93974ab5eee60a78b14f87d85..04a344059daa5369cb75eeee54643182f769e85d 100644
--- a/ecrire/exec/install.php
+++ b/ecrire/exec/install.php
@@ -127,7 +127,7 @@ function install_6()
# maintenant on connait le vrai charset du site s'il est deja configure
# sinon par defaut inc_meta reglera _DEFAULT_CHARSET
# (les donnees arrivent de toute facon postees en _DEFAULT_CHARSET)
- include_ecrire ('inc_meta');
+ include_spip('inc/meta');
lire_metas();
if ($login) {
@@ -547,7 +547,7 @@ function install_ldap5()
install_debut_html();
include_once(_FILE_CONNECT_INS . _FILE_TMP . _EXTENSION_PHP);
- include_ecrire('inc_meta');
+ include_spip('inc/meta');
ecrire_meta("ldap_statut_import", $statut_ldap);
ecrire_metas();
diff --git a/ecrire/inc/acces.php b/ecrire/inc/acces.php
index 1d8aec7f2d6da541292ab8aa8b01be4c136e1abb..99b14f22b58c8671b07466563356e24455319310 100644
--- a/ecrire/inc/acces.php
+++ b/ecrire/inc/acces.php
@@ -52,7 +52,7 @@ function low_sec($id_auteur) {
// Pas d'id_auteur : low_sec
if (!$id_auteur = intval($id_auteur)) {
if (!$low_sec = $GLOBALS['meta']['low_sec']) {
- include_ecrire('inc_meta');
+ include_spip('inc/meta');
ecrire_meta('low_sec', $low_sec = creer_pass_aleatoire());
ecrire_metas();
}
diff --git a/ecrire/inc/config.php b/ecrire/inc/config.php
index 85896eaa783c09cd152299a36816e56130244f0a..99f994372c9598e4e1df972c598d8292087904ba 100644
--- a/ecrire/inc/config.php
+++ b/ecrire/inc/config.php
@@ -12,7 +12,7 @@
if (!defined("_ECRIRE_INC_VERSION")) return;
-include_ecrire ("inc_meta");
+include_spip('inc/meta');
//
// Appliquer les valeurs par defaut pour les options non initialisees
diff --git a/ecrire/inc/import.php b/ecrire/inc/import.php
index eabe160f330b4f9cf2fc345fa3c5dcef8bf4f362..bd6d4637fc77b337a6ee28ca5e19f6d34ee4c9fb 100644
--- a/ecrire/inc/import.php
+++ b/ecrire/inc/import.php
@@ -347,7 +347,7 @@ function import_tables($f, $tables, $gz=false) {
$_fseek = ($gz) ? gzseek : fseek;
// utiliser une version fraiche des metas (ie pas le cache)
- include_ecrire('inc_meta');
+ include_spip('inc/meta');
lire_metas();
$s = spip_query("SELECT UNIX_TIMESTAMP(maj) AS d
diff --git a/ecrire/inc/invalideur.php b/ecrire/inc/invalideur.php
index e7d63f3f5b34fc65b028021f83c696bcc3da9944..89816076655ac98abb6696d8bbecd8eaa6879c14 100644
--- a/ecrire/inc/invalideur.php
+++ b/ecrire/inc/invalideur.php
@@ -13,7 +13,7 @@
if (!defined("_ECRIRE_INC_VERSION")) return;
-include_ecrire('inc_serialbase');
+include_spip('base/serial');
function supprime_invalideurs() {
spip_query("DELETE FROM spip_caches");
diff --git a/ecrire/inc/minipres.php b/ecrire/inc/minipres.php
index 71705cc5ed7b2fad93b9dfd9dc5c09f62cc481df..c4a871db0b6671ab5a077b5e15e642df72793da1 100644
--- a/ecrire/inc/minipres.php
+++ b/ecrire/inc/minipres.php
@@ -24,7 +24,7 @@ function install_debut_html($titre = 'AUTO') {
if ($titre=='AUTO')
$titre=_T('info_installation_systeme_publication');
- include_ecrire('inc_headers');
+ include_spip('inc/headers');
http_no_cache();
diff --git a/ecrire/inc/plugin.php b/ecrire/inc/plugin.php
index 8b18bcaf81cfa98b179662fbaf66b426baa87164..4416d482c784c98fc820aed0e3570b21b78fa0e8 100644
--- a/ecrire/inc/plugin.php
+++ b/ecrire/inc/plugin.php
@@ -17,7 +17,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
define('_FILE_PLUGIN_CONFIG', "plugin.xml");
// besoin de inc_meta
-include_ecrire ("inc_meta");
+include_spip('inc/meta');
// lecture des sous repertoire plugin existants
function liste_plugin_files(){
diff --git a/ecrire/inc/presentation.php b/ecrire/inc/presentation.php
index 4fad66f269e5e1844ad4a7df8d604900196d2d01..6aeb57600ee444b1ed700009e77473eb66a86074 100644
--- a/ecrire/inc/presentation.php
+++ b/ecrire/inc/presentation.php
@@ -2172,7 +2172,7 @@ function init_entete($titre, $rubrique, $css='') {
$nom_site_spip= _T('info_mon_site_spip');
// envoi des en-tetes, du doctype et du <head><title...
- include_ecrire('inc_headers');
+ include_spip('inc/headers');
http_no_cache();
$head = _DOCTYPE_ECRIRE
. "<html lang='".$GLOBALS['spip_lang']."' dir='"
diff --git a/ecrire/inc/rubriques.php b/ecrire/inc/rubriques.php
index 15f1270288561a14826cd68bea8ca0d369e7b8c6..8e2a19b35c3effacfcd735a02db8cdc91dd945a7 100644
--- a/ecrire/inc/rubriques.php
+++ b/ecrire/inc/rubriques.php
@@ -35,7 +35,7 @@ function calculer_rubriques() {
//
// Afficher les articles post-dates ?
- include_ecrire('inc_meta');
+ include_spip('inc/meta');
$postdates = ($GLOBALS['meta']["post_dates"] == "non") ?
"AND fille.date <= NOW()" : '';
@@ -209,7 +209,7 @@ function calculer_langues_rubriques() {
if ($GLOBALS['meta']['multi_rubriques'] == 'oui') {
// Ecrire meta liste langues utilisees dans rubriques
- include_ecrire('inc_meta');
+ include_spip('inc/meta');
$s = spip_query ("SELECT lang FROM spip_rubriques
WHERE lang != '' GROUP BY lang");
while ($row = spip_fetch_array($s)) {
diff --git a/ecrire/inc/session.php b/ecrire/inc/session.php
index f419d501edd1b1f9783d21449386e32d4c0a8118..9580b1f10c3153cad03733607ff990e79c85ab35 100644
--- a/ecrire/inc/session.php
+++ b/ecrire/inc/session.php
@@ -12,7 +12,7 @@
if (!defined("_ECRIRE_INC_VERSION")) return;
-include_ecrire ("inc_meta");
+include_spip('inc/meta');
/*
* Gestion de l'authentification par sessions
diff --git a/ecrire/inc/utils.php b/ecrire/inc/utils.php
index 6e0a91f6ffb418f4967cbd257df829c21465a552..3d94fc00b76d4f30fd5dafa4ca17fb10193af1d4 100644
--- a/ecrire/inc/utils.php
+++ b/ecrire/inc/utils.php
@@ -132,7 +132,7 @@ function minipipe($fonc,$val){
function pipeline($action,$val){
$ok = @is_readable($f = _DIR_SESSIONS."charger_pipelines.php");
if (!$ok){
- include_ecrire('inc_plugin');
+ include_spip('inc/plugin');
// generer les fichiers php precompiles
// de chargement des plugins et des pipelines
verif_plugin();
@@ -152,7 +152,7 @@ function pipeline($action,$val){
$val = $val['data'];
}
else{
- include_ecrire('inc_plugin');
+ include_spip('inc/plugin');
//on passe $action en arg pour creer la fonction meme si le pipe n'est defini nul part
// vu qu'on est la c'est qu'il existe !
verif_plugin($action);
@@ -553,7 +553,7 @@ function http_last_modified($lastmodified, $expire = 0) {
$GLOBALS['HTTP_IF_MODIFIED_SINCE']);
$if_modified_since = trim(str_replace('GMT', '', $if_modified_since));
if ($if_modified_since == $gmoddate) {
- include_ecrire('inc_headers');
+ include_spip('inc/headers');
http_status(304);
$headers_only = true;
}
diff --git a/ecrire/inc_debug_sql.php b/ecrire/inc_debug_sql.php
index 4376ead231a89e8a9081ce28925f9727837945db..f0626493c5de0ef77cfbdb420b4931aa3e6bf19e 100644
--- a/ecrire/inc_debug_sql.php
+++ b/ecrire/inc_debug_sql.php
@@ -124,7 +124,7 @@ function erreur_squelette($message='', $lieu='') {
if ($_COOKIE['spip_admin'] OR
$auteur_session['statut'] == '0minirezo' OR
($GLOBALS['var_mode'] == 'debug')) {
- include_ecrire('inc_headers');
+ include_spip('inc/headers');
lang_select($auteur_session['lang']);
http_no_cache();
echo _DOCTYPE_ECRIRE,
@@ -331,7 +331,7 @@ function debug_dumpfile ($texte, $fonc, $type) {
// - ca fait 2 headers !
ob_end_clean();
- include_ecrire('inc_headers');
+ include_spip('inc/headers');
http_no_cache();
lang_select($auteur_session['lang']);
echo _DOCTYPE_ECRIRE,
@@ -423,8 +423,8 @@ function debug_dumpfile ($texte, $fonc, $type) {
$titre = 'zbug_' . $titre;
}
else {
- include_ecrire("inc_spip_sax");
- $res = spip_sax($texte);
+ if ($sax = include_fonction('sax', 'inc');
+ $res = $sax($texte);
if (!$res)
$err = _T('impossible');
elseif (ereg("^[[:space:]]*([^<][^0-9]*)([0-9]*)(.*[^0-9])([0-9]*)$", $GLOBALS['xhtml_error'], $r)) {
diff --git a/ecrire/public.php b/ecrire/public.php
index 037abf4535cd225c0186ce754c72afb2523f0505..6009b3a9b5c81600ff8916b79d9cc50b32866746 100644
--- a/ecrire/public.php
+++ b/ecrire/public.php
@@ -33,7 +33,7 @@ if (defined("_INC_PUBLIC")) {
$page = calcule_header_et_page ($fond);
if ($page['status']) {
- include_ecrire('inc_headers');
+ include_spip('inc/headers');
http_status($page['status']);
}
diff --git a/ecrire/public/cache.php b/ecrire/public/cache.php
index 51c936b6cacac915e76ba1647564870fd74eecd3..fe196bc28f86a2311fab7e9a0f786e3666aece2b 100644
--- a/ecrire/public/cache.php
+++ b/ecrire/public/cache.php
@@ -181,7 +181,7 @@ function determiner_cache(&$use_cache, $contexte, $fond) {
// Faut-il effacer des pages invalidees (en particulier ce cache-ci) ?
if ($GLOBALS['meta']['invalider'] AND $GLOBALS['db_ok']) {
- include_ecrire('inc_meta');
+ include_spip('inc/meta');
lire_metas();
retire_caches($chemin_cache);
}
diff --git a/ecrire/public/calcul-outils.php b/ecrire/public/calcul-outils.php
index de6f25e7e9210393bb04875ef5ca7165013d904e..235dfcb830319066e75a65a3d1c70f64fe31bbb4 100644
--- a/ecrire/public/calcul-outils.php
+++ b/ecrire/public/calcul-outils.php
@@ -243,7 +243,7 @@ array("$element=$id_element"));
function table_from_primary($id) {
global $tables_principales;
- include_ecrire('inc_serialbase');
+ include_spip('base/serial');
foreach ($tables_principales as $k => $v) {
if ($v['key']['PRIMARY KEY'] == $id)
return array($k, array_key_exists('id_rubrique', $v['field']));
diff --git a/ecrire/public/calcul.php b/ecrire/public/calcul.php
index aa98d9abf5374b2f1ee4b72dbda8f681b6d3154b..c1ace6a101236676f375f08a25b8eb787bf37927 100644
--- a/ecrire/public/calcul.php
+++ b/ecrire/public/calcul.php
@@ -18,7 +18,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
// Ce fichier calcule une page en executant un squelette.
//
-include_ecrire("inc_meta");
+include_spip('inc/meta');
include_spip("inc/indexation");
include_spip('inc/texte');
include_spip('inc/lang');
diff --git a/ecrire/public/compilo.php b/ecrire/public/compilo.php
index fb2680d501a1b7b294612c3142873b3847f78e89..d91293e5d72b84f9479f7a223d4a53c18e66363c 100644
--- a/ecrire/public/compilo.php
+++ b/ecrire/public/compilo.php
@@ -37,7 +37,7 @@ include_spip('public/balises');
include_spip('public/compilo-api');
# definition des tables
-include_ecrire('inc_serialbase');
+include_spip('base/serial');
//
// Calculer un <INCLURE()>
diff --git a/ecrire/public/criteres.php b/ecrire/public/criteres.php
index ac479fe480019fa2f2a0ca73fcb4c9e77d272725..27f20a3d074ff024cc059e623b30f5edf0e81659 100644
--- a/ecrire/public/criteres.php
+++ b/ecrire/public/criteres.php
@@ -645,7 +645,7 @@ function trouver_def_table($nom, &$boucle)
if ($boucle->sql_serveur &&
$desc = $tables_des_serveurs_sql[$boucle->sql_serveur][$nom])
return array($nom, $desc);
- include_ecrire('inc_auxbase');
+ include_spip('base/aux');
if ($desc = $tables_auxiliaires['spip_' . $nom])
return array('spip_' . $nom, $desc);
diff --git a/ecrire/public/messforum.php b/ecrire/public/messforum.php
index 72165e98608cda23e1fa09ca470e9460cc2baeb0..a57c1793bb0612f212ea7f509d7ddd3f7e2d027d 100644
--- a/ecrire/public/messforum.php
+++ b/ecrire/public/messforum.php
@@ -11,7 +11,7 @@
\***************************************************************************/
if (!defined("_ECRIRE_INC_VERSION")) return;
-include_ecrire('inc_meta');
+include_spip('inc/meta');
include_spip('inc/forum');
include_spip('inc/filtres');
include_ecrire("inc_abstract_sql");
diff --git a/ecrire/urls/propres.php b/ecrire/urls/propres.php
index df902e2207b06a80cc0f208624673a5f1eac5e06..6ddf711825a86004ecca055f4a341e44513aad6f 100644
--- a/ecrire/urls/propres.php
+++ b/ecrire/urls/propres.php
@@ -223,7 +223,7 @@ function recuperer_parametres_url(&$fond, $url) {
$url_propre = $func($id_objet);
if ($url_propre
AND ($url_propre<>$regs[2])) {
- include_ecrire('inc_headers');
+ include_spip('inc/headers');
http_status(301);
// recuperer les arguments supplementaires (&debut_xxx=...)
$reste = preg_replace('/^&/','?',
diff --git a/formulaires/inc-formulaire_forum.php b/formulaires/inc-formulaire_forum.php
index 4d6a95251bf5628890600b4925f0e17216f0def0..392cdf93bb333eca0763ad88f0061857880ad024 100644
--- a/formulaires/inc-formulaire_forum.php
+++ b/formulaires/inc-formulaire_forum.php
@@ -12,7 +12,7 @@
if (!defined("_ECRIRE_INC_VERSION")) return; #securite
-include_ecrire('inc_meta');
+include_spip('inc/meta');
include_spip('inc/session');
include_spip('inc/acces');
include_spip('inc/texte');
diff --git a/formulaires/inc-formulaire_signature.php b/formulaires/inc-formulaire_signature.php
index d784fc5782c3243b6daba1ebfc52ae333fb8efb9..5d29a98efd5a057d1042021715345f64003ca7b5 100644
--- a/formulaires/inc-formulaire_signature.php
+++ b/formulaires/inc-formulaire_signature.php
@@ -161,7 +161,7 @@ function reponse_confirmation($id_article, $var_confirm = '') {
$result = spip_query($query);
// invalider les pages ayant des boucles signatures
include_spip('inc/invalideur');
- include_ecrire('inc_meta');
+ include_spip('inc/meta');
suivre_invalideur("id='varia/pet$id_article'");
$confirm= (_T('form_pet_signature_validee'));
@@ -231,7 +231,7 @@ function reponse_signature($id_article, $nom_email, $adresse_email, $message, $n
if (!$nom_site) {
return _T('form_indiquer_nom_site');
}
- include_ecrire("inc_sites");
+ include_spip('inc/sites');
if (!recuperer_page($url_site)) {
return _T('form_pet_url_invalide');
diff --git a/formulaires/inc-formulaire_site.php b/formulaires/inc-formulaire_site.php
index 6f29ed9a33c0ebfc7b93cd95747537dadcd88b6f..a2ef1ad1bc9706d0621661b76c97f3451f174580 100644
--- a/formulaires/inc-formulaire_site.php
+++ b/formulaires/inc-formulaire_site.php
@@ -42,7 +42,7 @@ function balise_FORMULAIRE_SITE_dyn($id_rubrique) {
}
// Tester l'URL du site
- include_ecrire("inc_sites");
+ include_spip('inc/sites');
if (!recuperer_page(_request('url_site')))
return _T('form_pet_url_invalide');
diff --git a/formulaires/inc-login_public.php b/formulaires/inc-login_public.php
index 7100a1a5dbceab4f42076b4a467355066e7da40c..10112a2092fb005b1a3b064ebfd34e1a926c9d20 100644
--- a/formulaires/inc-login_public.php
+++ b/formulaires/inc-login_public.php
@@ -12,7 +12,7 @@
if (!defined("_ECRIRE_INC_VERSION")) return; #securite
-include_ecrire("inc_meta");
+include_spip('inc/meta');
include_spip('inc/session');
include_spip('inc/filtres');
include_spip('inc/logos');
@@ -87,7 +87,7 @@ function login_pour_tous($login, $cible, $action) {
$pose_cookie = generer_url_public('spip_cookie');
if ($echec_cookie AND !$ignore_auth_http) {
- include_ecrire('inc_headers');
+ include_spip('inc/headers');
if (php_module()) $auth_http = $pose_cookie;
}
// Attention dans le cas 'intranet' la proposition de se loger