diff --git a/ecrire/action/cookie.php b/ecrire/action/cookie.php index a21c6c3dea5d9bb1122865e081c9e38b7410ce2b..0da366572fee85cdce08013c8925597d622abede 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 d624468e1ab1a32fae42a43710668c2dc6789c67..d7cc54b960a0d49d200e204f581f898cd7547b80 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 3b7ef124fdf522c1fed87599adeaa053c5a76eb2..e85be0b151e7a0592c7d54c9d794512a7625f2f5 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 ddf47f99c3e688c48b93c010579ac4ff312cae7e..c57fbef5b951e51568da02baca709108841c7636 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 0925f731205b25f84697a01d3b945ae80e70d591..ec2f44b67bbcd1a2122aa237c2454d7f7d35aa30 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 a86e3ee12d71f364f08f1b84e63271ada02bcf64..71dfc406603923268ba96a18632080caad2b87e2 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 9a5b169e733511d77b67815acf0ef44c7014406d..495332a53f2732079b781e5bd4c28b702f6a4fba 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 79763e04f08a880af2906b801ccc66d392742e34..d3eedb84a647a89d9bd7c17aae1f808854ec4141 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 17f57852701033ef323144eda858721781640906..80ea85e8ed71c4c5b5b0313a4e812e5d8b164547 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 2dd7e7fb25c18b306c7f141b8b9690b9b91b7061..db1377564679b4cb11e76372a015359abb8fac32 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 a48f8e49a45dec58c21a769380aad171e725b726..7b3863a67a82670d29edec1ab6ecb322bb69f3ec 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 a257a2fb9c3c988d4fbdbee12818f5eb5d192a1f..cb61394bcb8d13572704968316eedd3de4e7e99e 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 4638a20e2322748c0dc45f1503f5577e68d6760d..d6fa409233bed28cb2efeff11050f76146cc8a06 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 510acefbbf400b9786ab21c72c443ebf9eb9af30..42374f1a3af611acd1715d2f60fddafe193db3e7 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 14c7ad664023ba27b936f2fc632e42903ffbbdeb..daae13c6e8ee6f6289ec463782ad5cef35b41578 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 c17e54f6a0634dbabce289b5ff2b3988858fd628..8cf52bbbc234d323e4c84a73bd2f17be6a898657 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 ac6404527ebef1301770a745c9e4e50caaf60a0a..47355e545619e254dc0d7bdc51b41a7807ecf4eb 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 b8453b64870c6979771b5e235545212c37ecf07c..48905e0e18d5792d44dd7b7ede9182b935d0e5c7 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 e20013e26a07355b32dad8f2e7b6fceedd5ea43a..34c321bb84cfe610d01fe818940482b6c5a586f5 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 d115940424e4d45507f4a3cced20253c498e87fc..d34752465b67499822550185eb71f41b1d1cd086 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 4d5c85248982bc55ae74e3b8b3048aa4c30372ed..174f9223d31a558fd7353324020e215846a3add2 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 31c4c81af710949aa690e4a27b1ee6e823502d4c..ff5205e9deda87f3b0ff541830f2729fe67cdcef 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 e5cab6ece9e10a18201b0b6d0bd1c3a82dae8bce..cb29dac37c2f6ab50918107eca4a806de2f21184 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 f8fbad0f4d1e9bdaedf36aaa26ab46bc3358ae7a..322b19804432064017bf9657e6c2145f22b62ce1 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 6e9d888d8064b6d05562135012adb489c4fcd6f3..627f7a887bbcdb3ad54afefd21886ffbe34f45e2 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 7bec126deed81a148b0f9ab8a88e00d8271e768f..8a7c65b32a617bbfb890ceaae143a51131052a8c 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 b07cb0590830b81f55b30104632d6b10c8ffc499..7db6fb427e48882a43fc972d63b499fc6f17d4cf 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 e8e1f3a1ff7227c58d8111a85c08796eacd2181d..8a6ec396696a84b6122f5548c78ad6e769d69569 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 13a447217e63a08dec7df0d871a04587de46ef82..713be60c4bfe24147cd94df92c30871a785d8d2b 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) {