From b58a2c708718b7cba7c67b2720d000acc662a93b Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Tue, 5 Sep 2006 17:55:33 +0000
Subject: [PATCH] Correction #557 au bulldozer: tous les fichiers appelant une
fonction _action incluent d'office inc/actions
---
ecrire/action/cookie.php | 6 ++++--
ecrire/action/documenter.php | 2 +-
ecrire/action/editer_article.php | 4 ++--
ecrire/action/editer_auteurs.php | 2 +-
ecrire/action/joindre.php | 2 +-
ecrire/action/poster.php | 2 +-
ecrire/action/referencer_traduction.php | 3 +--
ecrire/action/supprimer.php | 2 +-
ecrire/action/tourner.php | 2 +-
ecrire/action/virtualiser.php | 2 +-
ecrire/exec/admin_vider.php | 1 +
ecrire/exec/articles.php | 4 ++--
ecrire/exec/articles_edit.php | 1 +
ecrire/exec/breves_voir.php | 1 +
ecrire/exec/discuter.php | 4 +---
ecrire/exec/editer_auteurs.php | 3 +--
ecrire/exec/naviguer.php | 1 +
ecrire/exec/upgrade.php | 3 ++-
ecrire/exec/virtualiser.php | 3 +--
ecrire/inc/auteur_voir.php | 3 +++
ecrire/inc/chercher_logo.php | 3 ++-
ecrire/inc/forum_insert.php | 3 ++-
ecrire/inc/install_unpack.php | 3 +++
ecrire/inc/lang.php | 3 ++-
ecrire/inc/meta.php | 5 +----
ecrire/inc/mots.php | 1 +
ecrire/inc/petition.php | 1 +
ecrire/inc/presentation.php | 2 +-
ecrire/inc/sites_voir.php | 2 ++
29 files changed, 43 insertions(+), 31 deletions(-)
diff --git a/ecrire/action/cookie.php b/ecrire/action/cookie.php
index a21c6c3dea..0da366572f 100644
--- a/ecrire/action/cookie.php
+++ b/ecrire/action/cookie.php
@@ -10,6 +10,10 @@
* Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne. *
\***************************************************************************/
+if (!defined("_ECRIRE_INC_VERSION")) return;
+
+include_spip('inc/actions');
+include_spip('inc/cookie');
// http://doc.spip.org/@auth_http
function auth_http($url) {
@@ -31,8 +35,6 @@ function auth_http($url) {
// http://doc.spip.org/@action_cookie_dist
function action_cookie_dist()
{
- include_spip('inc/actions');
- include_spip('inc/cookie');
global
$auteur_session,
$change_session,
diff --git a/ecrire/action/documenter.php b/ecrire/action/documenter.php
index d624468e1a..d7cc54b960 100644
--- a/ecrire/action/documenter.php
+++ b/ecrire/action/documenter.php
@@ -13,6 +13,7 @@
if (!defined("_ECRIRE_INC_VERSION")) return;
include_spip('inc/filtres');
+include_spip('inc/actions');
// En Ajax on utilise GET et sinon POST.
// De plus Ajax en POST ne remplit pas $_POST
@@ -22,7 +23,6 @@ include_spip('inc/filtres');
// http://doc.spip.org/@action_documenter_dist
function action_documenter_dist() {
- include_spip('inc/actions');
$var_f = charger_fonction('controler_action_auteur', 'inc');
$var_f();
diff --git a/ecrire/action/editer_article.php b/ecrire/action/editer_article.php
index 3b7ef124fd..e85be0b151 100644
--- a/ecrire/action/editer_article.php
+++ b/ecrire/action/editer_article.php
@@ -12,11 +12,11 @@
if (!defined("_ECRIRE_INC_VERSION")) return;
+include_spip('inc/actions');
+
// http://doc.spip.org/@action_editer_article_dist
function action_editer_article_dist() {
-
- include_spip('inc/actions');
$var_f = charger_fonction('controler_action_auteur', 'inc');
$var_f();
diff --git a/ecrire/action/editer_auteurs.php b/ecrire/action/editer_auteurs.php
index ddf47f99c3..c57fbef5b9 100644
--- a/ecrire/action/editer_auteurs.php
+++ b/ecrire/action/editer_auteurs.php
@@ -13,11 +13,11 @@
if (!defined("_ECRIRE_INC_VERSION")) return;
include_spip('base/abstract_sql');
+include_spip('inc/actions');
// http://doc.spip.org/@action_ajouter_dist
function action_editer_auteurs_dist() {
- include_spip('inc/actions');
$var_f = charger_fonction('controler_action_auteur', 'inc');
$var_f();
diff --git a/ecrire/action/joindre.php b/ecrire/action/joindre.php
index 0925f73120..ec2f44b67b 100644
--- a/ecrire/action/joindre.php
+++ b/ecrire/action/joindre.php
@@ -15,6 +15,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
include_spip('inc/charsets'); # pour le nom de fichier
include_spip('inc/getdocument');
include_spip('base/abstract_sql');
+include_spip('inc/actions');
// http://doc.spip.org/@action_joindre_dist
function action_joindre_dist()
@@ -27,7 +28,6 @@ function action_joindre_dist()
$sousaction5,
$_FILES, $HTTP_POST_FILES;
- include_spip('inc/actions');
$var_f = charger_fonction('controler_action_auteur', 'inc');
$var_f();
diff --git a/ecrire/action/poster.php b/ecrire/action/poster.php
index a86e3ee12d..71dfc40660 100644
--- a/ecrire/action/poster.php
+++ b/ecrire/action/poster.php
@@ -12,12 +12,12 @@
if (!defined("_ECRIRE_INC_VERSION")) return;
+include_spip('inc/actions');
// Modifier le reglage des forums publics de l'article x
// http://doc.spip.org/@action_poster_dist
function action_poster_dist()
{
- include_spip('inc/actions');
$var_f = charger_fonction('controler_action_auteur', 'inc');
$var_f();
diff --git a/ecrire/action/referencer_traduction.php b/ecrire/action/referencer_traduction.php
index 9a5b169e73..495332a53f 100644
--- a/ecrire/action/referencer_traduction.php
+++ b/ecrire/action/referencer_traduction.php
@@ -13,12 +13,11 @@
if (!defined("_ECRIRE_INC_VERSION")) return;
include_spip('inc/filtres');
-
+include_spip('inc/actions');
// http://doc.spip.org/@action_referencer_traduction_dist
function action_referencer_traduction_dist() {
- include_spip('inc/actions');
$var_f = charger_fonction('controler_action_auteur', 'inc');
$var_f();
diff --git a/ecrire/action/supprimer.php b/ecrire/action/supprimer.php
index 79763e04f0..d3eedb84a6 100644
--- a/ecrire/action/supprimer.php
+++ b/ecrire/action/supprimer.php
@@ -14,12 +14,12 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
include_spip('inc/charsets'); # pour le nom de fichier
include_spip('base/abstract_sql');
+include_spip('inc/actions');
// Effacer un doc (et sa vignette)
// http://doc.spip.org/@action_supprimer_dist
function action_supprimer_dist() {
- include_spip('inc/actions');
$var_f = charger_fonction('controler_action_auteur', 'inc');
$var_f();
diff --git a/ecrire/action/tourner.php b/ecrire/action/tourner.php
index 17f5785270..80ea85e8ed 100644
--- a/ecrire/action/tourner.php
+++ b/ecrire/action/tourner.php
@@ -14,13 +14,13 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
include_spip('inc/charsets'); # pour le nom de fichier
include_spip('base/abstract_sql');
+include_spip('inc/actions');
// http://doc.spip.org/@action_tourner_dist
function action_tourner_dist() {
global $convert_command;
- include_spip('inc/actions');
$var_f = charger_fonction('controler_action_auteur', 'inc');
$var_f();
diff --git a/ecrire/action/virtualiser.php b/ecrire/action/virtualiser.php
index 2dd7e7fb25..db13775646 100644
--- a/ecrire/action/virtualiser.php
+++ b/ecrire/action/virtualiser.php
@@ -13,13 +13,13 @@
if (!defined("_ECRIRE_INC_VERSION")) return;
include_spip('inc/filtres');
+include_spip('inc/actions');
// http://doc.spip.org/@action_virtualiser_dist
function action_virtualiser_dist() {
global $convert_command;
- include_spip('inc/actions');
$var_f = charger_fonction('controler_action_auteur', 'inc');
$var_f();
diff --git a/ecrire/exec/admin_vider.php b/ecrire/exec/admin_vider.php
index a48f8e49a4..7b3863a67a 100644
--- a/ecrire/exec/admin_vider.php
+++ b/ecrire/exec/admin_vider.php
@@ -13,6 +13,7 @@
if (!defined("_ECRIRE_INC_VERSION")) return;
include_spip('inc/presentation');
+include_spip('inc/actions');
// http://doc.spip.org/@exec_admin_vider_dist
function exec_admin_vider_dist()
diff --git a/ecrire/exec/articles.php b/ecrire/exec/articles.php
index a257a2fb9c..cb61394bcb 100644
--- a/ecrire/exec/articles.php
+++ b/ecrire/exec/articles.php
@@ -15,6 +15,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
include_spip('inc/presentation');
include_spip('inc/texte');
include_spip('inc/rubriques');
+include_spip('inc/actions');
include_spip('inc/mots');
include_spip('inc/date');
include_spip('inc/documents');
@@ -208,8 +209,7 @@ if ($options == 'avancees' AND $GLOBALS['meta']["articles_mots"] != 'non') {
echo "\n<div align='center'>";
icone(_T('icone_poster_message'), generer_url_ecrire("forum_envoi","statut=prive&id_article=$id_article&titre_message=$tm&url=" . generer_url_retour("articles","id_article=$id_article")), "forum-interne-24.gif", "creer.gif");
echo "</div><br />";
-
- echo exec_discuter_dist($id_article, $debut);
+ echo "<div id='forum'>", exec_discuter_dist($id_article, $debut),"</div>";
fin_page();
diff --git a/ecrire/exec/articles_edit.php b/ecrire/exec/articles_edit.php
index 4638a20e23..d6fa409233 100644
--- a/ecrire/exec/articles_edit.php
+++ b/ecrire/exec/articles_edit.php
@@ -15,6 +15,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
include_spip('inc/presentation');
include_spip('inc/article_select');
include_spip('inc/rubriques');
+include_spip('inc/actions');
include_spip('inc/documents');
include_spip('inc/barre');
diff --git a/ecrire/exec/breves_voir.php b/ecrire/exec/breves_voir.php
index 510acefbbf..42374f1a3a 100644
--- a/ecrire/exec/breves_voir.php
+++ b/ecrire/exec/breves_voir.php
@@ -15,6 +15,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
include_spip('inc/presentation');
include_spip('inc/rubriques');
include_spip('inc/mots');
+include_spip('inc/actions');
include_spip('inc/date');
include_spip('base/abstract_sql');
include_spip("inc/indexation");
diff --git a/ecrire/exec/discuter.php b/ecrire/exec/discuter.php
index 14c7ad6640..daae13c6e8 100644
--- a/ecrire/exec/discuter.php
+++ b/ecrire/exec/discuter.php
@@ -45,9 +45,7 @@ function formulaire_discuter($query, $total, $debut, $total_afficher, $script, $
. "<br />"
. $nav;
- return (_request('var_ajaxcharset'))
- ? $res
- : "<div id='forum'>$res</div>";
+ return $res;
}
// http://doc.spip.org/@exec_discuter_dist
diff --git a/ecrire/exec/editer_auteurs.php b/ecrire/exec/editer_auteurs.php
index c17e54f6a0..8cf52bbbc2 100644
--- a/ecrire/exec/editer_auteurs.php
+++ b/ecrire/exec/editer_auteurs.php
@@ -13,11 +13,10 @@
if (!defined("_ECRIRE_INC_VERSION")) return;
include_spip('inc/presentation');
+include_spip('inc/actions');
function exec_editer_auteurs_dist()
{
- include_spip('inc/actions');
-
$id_article = intval(_request('id_article'));
if ($GLOBALS['connect_toutes_rubriques']) // pour eviter SQL
diff --git a/ecrire/exec/naviguer.php b/ecrire/exec/naviguer.php
index ac6404527e..47355e5456 100644
--- a/ecrire/exec/naviguer.php
+++ b/ecrire/exec/naviguer.php
@@ -15,6 +15,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
include_spip('inc/presentation');
include_spip('inc/texte');
include_spip('inc/rubriques');
+include_spip('inc/actions');
include_spip('inc/forum');
include_spip('inc/mots');
include_spip('inc/documents');
diff --git a/ecrire/exec/upgrade.php b/ecrire/exec/upgrade.php
index b8453b6487..48905e0e18 100644
--- a/ecrire/exec/upgrade.php
+++ b/ecrire/exec/upgrade.php
@@ -12,6 +12,8 @@
if (!defined("_ECRIRE_INC_VERSION")) return;
+include_spip('inc/actions');
+
// http://doc.spip.org/@exec_upgrade_dist
function exec_upgrade_dist() {
@@ -79,7 +81,6 @@ function exec_upgrade_dist() {
fin_admin($upgrade_titre);
- include_spip('inc/actions');
redirige_par_entete(generer_action_auteur('purger', 'cache', _DIR_RESTREINT_ABS, true));
}
diff --git a/ecrire/exec/virtualiser.php b/ecrire/exec/virtualiser.php
index e20013e26a..34c321bb84 100644
--- a/ecrire/exec/virtualiser.php
+++ b/ecrire/exec/virtualiser.php
@@ -11,6 +11,7 @@
\***************************************************************************/
if (!defined("_ECRIRE_INC_VERSION")) return;
+include_spip('inc/actions');
// http://doc.spip.org/@formulaire_virtualiser
function formulaire_virtualiser($id_article, $virtuel, $script, $args)
@@ -55,8 +56,6 @@ function exec_virtualiser_dist()
minipres(_T('info_acces_interdit'));
}
- include_spip('inc/actions');
-
return formulaire_virtualiser($id_article, 'ajax', $script, "id_article=$id_article");
}
diff --git a/ecrire/inc/auteur_voir.php b/ecrire/inc/auteur_voir.php
index d115940424..d34752465b 100644
--- a/ecrire/inc/auteur_voir.php
+++ b/ecrire/inc/auteur_voir.php
@@ -11,6 +11,9 @@
\***************************************************************************/
if (!defined("_ECRIRE_INC_VERSION")) return;
+
+include_spip('inc/actions');
+
// http://doc.spip.org/@cadre_auteur_infos
function cadre_auteur_infos($id_auteur, $auteur)
{
diff --git a/ecrire/inc/chercher_logo.php b/ecrire/inc/chercher_logo.php
index 4d5c852489..174f9223d3 100644
--- a/ecrire/inc/chercher_logo.php
+++ b/ecrire/inc/chercher_logo.php
@@ -12,6 +12,8 @@
if (!defined("_ECRIRE_INC_VERSION")) return;
+include_spip('inc/actions');
+
// http://doc.spip.org/@inc_chercher_logo_dist
function inc_chercher_logo_dist($id, $type, $mode='on') {
global $formats_logos;
@@ -106,7 +108,6 @@ function afficher_boite_logo($id_objet, $id, $texteon, $texteoff, $script) {
function indiquer_logo($titre, $id_objet, $mode, $id, $script) {
global $formats_logos;
- include_spip('inc/actions');
$dir_ftp = determine_upload();
$afficher = "";
$reg = '[.](' . join('|', $formats_logos) . ')$';
diff --git a/ecrire/inc/forum_insert.php b/ecrire/inc/forum_insert.php
index 31c4c81af7..ff5205e9de 100644
--- a/ecrire/inc/forum_insert.php
+++ b/ecrire/inc/forum_insert.php
@@ -15,6 +15,8 @@ include_spip('inc/meta');
include_spip('inc/forum');
include_spip('inc/filtres');
include_spip('base/abstract_sql');
+include_spip('inc/actions');
+
spip_connect();
// Ce fichier est inclus lorsqu'on appelle un script de l'espace public
@@ -124,7 +126,6 @@ function forum_insert_secure($alea, $hash)
$ids[$o] = ($x = intval($_POST[$o])) ? $x : '';
}
- include_spip('inc/actions');
if (!verifier_action_auteur('ajout_forum'.join(' ', $ids).' '.$alea,
$hash)) {
spip_log('erreur hash forum');
diff --git a/ecrire/inc/install_unpack.php b/ecrire/inc/install_unpack.php
index e5cab6ece9..cb29dac37c 100644
--- a/ecrire/inc/install_unpack.php
+++ b/ecrire/inc/install_unpack.php
@@ -10,6 +10,9 @@
* Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne. *
\***************************************************************************/
+if (!defined("_ECRIRE_INC_VERSION")) return;
+include_spip('inc/actions');
+
// http://doc.spip.org/@inc_install_unpack
function inc_install_unpack()
{
diff --git a/ecrire/inc/lang.php b/ecrire/inc/lang.php
index f8fbad0f4d..322b198044 100644
--- a/ecrire/inc/lang.php
+++ b/ecrire/inc/lang.php
@@ -12,6 +12,8 @@
if (!defined("_ECRIRE_INC_VERSION")) return;
+include_spip('inc/actions');
+
//
// Charger un fichier langue
//
@@ -262,7 +264,6 @@ function menu_langues($nom_select = 'var_lang', $default = '', $texte = '', $her
} else {
$cible = _DIR_RESTREINT_ABS . $lien;
if (_FILE_CONNECT) {
- include_spip('inc/actions');
$lien = generer_action_auteur('cookie','var_lang_ecrire');
} else $lien = generer_url_action('cookie');
}
diff --git a/ecrire/inc/meta.php b/ecrire/inc/meta.php
index 6e9d888d80..627f7a887b 100644
--- a/ecrire/inc/meta.php
+++ b/ecrire/inc/meta.php
@@ -30,7 +30,6 @@ function lire_metas() {
function ecrire_meta($nom, $valeur) {
if (strlen($nom)){
$GLOBALS['meta'][$nom] = $valeur;
- if (!_FILE_CONNECT) return;
spip_query("REPLACE spip_meta (nom, valeur) VALUES ('$nom', " . spip_abstract_quote($valeur) . " )");
}
}
@@ -47,7 +46,6 @@ function effacer_meta($nom) {
//
// http://doc.spip.org/@ecrire_metas
function ecrire_metas() {
- if (!_FILE_CONNECT) return;
lire_metas();
@@ -80,6 +78,5 @@ if (!isset($GLOBALS['meta']))
if ((!_DIR_RESTREINT) AND _FILE_CONNECT AND abs(time() - $GLOBALS['meta']['alea_ephemere_date']) > 2 * 24*3600) {
include_spip('inc/acces');
renouvelle_alea();
-}
-
+ }
?>
diff --git a/ecrire/inc/mots.php b/ecrire/inc/mots.php
index 7bec126dee..8a7c65b32a 100644
--- a/ecrire/inc/mots.php
+++ b/ecrire/inc/mots.php
@@ -11,6 +11,7 @@
\***************************************************************************/
if (!defined("_ECRIRE_INC_VERSION")) return;
+include_spip('inc/actions');
// ne pas faire d'erreur si les chaines sont > 254 caracteres
// http://doc.spip.org/@levenshtein255
diff --git a/ecrire/inc/petition.php b/ecrire/inc/petition.php
index b07cb05908..7db6fb427e 100644
--- a/ecrire/inc/petition.php
+++ b/ecrire/inc/petition.php
@@ -11,6 +11,7 @@
\***************************************************************************/
if (!defined("_ECRIRE_INC_VERSION")) return;
+include_spip('inc/actions');
// http://doc.spip.org/@formulaire_petitionner
function formulaire_petitionner($id_article, $script, $args, $ajax=false)
diff --git a/ecrire/inc/presentation.php b/ecrire/inc/presentation.php
index e8e1f3a1ff..8a6ec39669 100644
--- a/ecrire/inc/presentation.php
+++ b/ecrire/inc/presentation.php
@@ -14,6 +14,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
include_spip('inc/agenda'); // inclut inc/layer, inc/texte, inc/filtre
include_spip('inc/boutons');
+include_spip('inc/actions');
// Choix dynamique de la couleur
@@ -708,7 +709,6 @@ function puce_statut_breve($id, $statut, $type, $droit) {
// http://doc.spip.org/@afficher_script_statut
function afficher_script_statut($id, $type, $n, $img, $statut, $title, $act)
{
- include_spip('inc/actions');
return http_href_img("javascript:selec_statut('$id', '$type', -1, '" .
http_wrapper($img) .
"', '" .
diff --git a/ecrire/inc/sites_voir.php b/ecrire/inc/sites_voir.php
index 13a447217e..713be60c4b 100644
--- a/ecrire/inc/sites_voir.php
+++ b/ecrire/inc/sites_voir.php
@@ -12,6 +12,8 @@
if (!defined("_ECRIRE_INC_VERSION")) return;
+include_spip('inc/actions');
+
// http://doc.spip.org/@afficher_sites
function afficher_sites($titre_table, $requete)
{
--
GitLab