From 2d8ee6946b9965df73183e2f528b5e6f1e53f31e Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Thu, 26 Jan 2006 11:15:59 +0000
Subject: [PATCH] Ce depot resulte de l'application de: normalise_inc () {
for i in $(grep -l 'pclzip.lib' inc*php*); do sed
's/pclzip.lib/inc_pclzip/' $i >x; mv x $i; done; $MVCOMMAND
pclzip.lib.php inc_pclzip.php; for i in $(grep -l 'lab_' inc*php*);
do sed 's/lab_/inc_/' $i >x; mv x $i; done;
$MVCOMMAND lab_diff.php inc_diff.php; $MVCOMMAND lab_ortho.php
inc_ortho.php; $MVCOMMAND lab_revisions.php inc_revisions.php }
---
ecrire/inc_articles.php | 2 +-
ecrire/inc_articles_ortho.php | 2 +-
ecrire/inc_articles_versions.php | 4 ++--
ecrire/{lab_diff.php => inc_diff.php} | 0
ecrire/inc_getdocument.php3 | 4 ++--
ecrire/inc_majbase.php3 | 2 +-
ecrire/{lab_ortho.php => inc_ortho.php} | 0
ecrire/{pclzip.lib.php => inc_pclzip.php} | 0
ecrire/{lab_revisions.php => inc_revisions.php} | 0
ecrire/inc_spip_action_joindre.php | 2 +-
ecrire/inc_suivi_versions.php | 4 ++--
11 files changed, 10 insertions(+), 10 deletions(-)
rename ecrire/{lab_diff.php => inc_diff.php} (100%)
rename ecrire/{lab_ortho.php => inc_ortho.php} (100%)
rename ecrire/{pclzip.lib.php => inc_pclzip.php} (100%)
rename ecrire/{lab_revisions.php => inc_revisions.php} (100%)
diff --git a/ecrire/inc_articles.php b/ecrire/inc_articles.php
index 80dac8ea87..023628067f 100644
--- a/ecrire/inc_articles.php
+++ b/ecrire/inc_articles.php
@@ -1449,7 +1449,7 @@ function revisions_articles ($id_article, $id_secteur, $id_rubrique, $id_rubriqu
// Stockage des versions : creer une premier version si non-existante
if (($GLOBALS['meta']["articles_versions"]=='oui') && $flag_revisions) {
- include_ecrire("lab_revisions");
+ include_ecrire("inc_revisions");
if ($new != 'oui') {
$query = "SELECT id_article FROM spip_versions WHERE id_article=$id_article LIMIT 1";
if (!spip_num_rows(spip_query($query))) {
diff --git a/ecrire/inc_articles_ortho.php b/ecrire/inc_articles_ortho.php
index 3f692bc7ec..6b54abd02a 100644
--- a/ecrire/inc_articles_ortho.php
+++ b/ecrire/inc_articles_ortho.php
@@ -14,7 +14,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
include_ecrire("inc_presentation");
include_ecrire("inc_distant");
-include_ecrire("lab_ortho");
+include_ecrire("inc_ortho");
function articles_ortho_dist()
{
diff --git a/ecrire/inc_articles_versions.php b/ecrire/inc_articles_versions.php
index b2c3c8a94b..99c0ca2c1f 100644
--- a/ecrire/inc_articles_versions.php
+++ b/ecrire/inc_articles_versions.php
@@ -14,7 +14,7 @@
if (!defined("_ECRIRE_INC_VERSION")) return;
include_ecrire("inc_presentation");
-include_ecrire("lab_revisions");
+include_ecrire("inc_revisions");
function articles_versions_dist()
{
@@ -81,7 +81,7 @@ if (!$id_diff) {
//
if ($id_version && $id_diff) {
- include_ecrire("lab_diff");
+ include_ecrire("inc_diff");
if ($id_diff > $id_version) {
$t = $id_version;
diff --git a/ecrire/lab_diff.php b/ecrire/inc_diff.php
similarity index 100%
rename from ecrire/lab_diff.php
rename to ecrire/inc_diff.php
diff --git a/ecrire/inc_getdocument.php3 b/ecrire/inc_getdocument.php3
index 5a6c5286ad..eb91add7b1 100644
--- a/ecrire/inc_getdocument.php3
+++ b/ecrire/inc_getdocument.php3
@@ -261,7 +261,7 @@ function ajouter_un_document ($source, $nom_envoye, $type_lien, $id_lien, $mode,
$tmp = $tmp_dir.'/'.translitteration($nom_envoye);
$nom_envoye .= '.zip'; # conserver l'extension dans le nom de fichier, par exemple toto.js => toto.js.zip
$fichier = deplacer_fichier_upload($source, $tmp);
- include_ecrire('pclzip.lib');
+ include_ecrire('inc_pclzip');
$source = _DIR_IMG.'tmp/archive.zip';
$archive = new PclZip($source);
$v_list = $archive->create($tmp,
@@ -412,7 +412,7 @@ function examiner_les_fichiers($files, $mode, $type, $id, $id_document, $hash, $
);
if (!$zip) die ('Erreur upload zip'); # pathologique
// Est-ce qu'on sait le lire ?
- include_ecrire('pclzip.lib');
+ include_ecrire('inc_pclzip');
$archive = new PclZip($zip);
if ($archive) {
// presenter une interface pour choisir si fichier joint ou decompacte
diff --git a/ecrire/inc_majbase.php3 b/ecrire/inc_majbase.php3
index 744ea15b33..e0eb5b9bdd 100644
--- a/ecrire/inc_majbase.php3
+++ b/ecrire/inc_majbase.php3
@@ -907,7 +907,7 @@ function maj_base() {
#if ($version_installee < 1.806)
# maj_version(1.806);
- // URLs propres (lab_version = 0.12)
+ // URLs propres (inc_version = 0.12)
if ($version_installee < 1.807) {
foreach (array('articles', 'breves', 'rubriques', 'mots') as $objets) {
spip_query("ALTER TABLE spip_$objets
diff --git a/ecrire/lab_ortho.php b/ecrire/inc_ortho.php
similarity index 100%
rename from ecrire/lab_ortho.php
rename to ecrire/inc_ortho.php
diff --git a/ecrire/pclzip.lib.php b/ecrire/inc_pclzip.php
similarity index 100%
rename from ecrire/pclzip.lib.php
rename to ecrire/inc_pclzip.php
diff --git a/ecrire/lab_revisions.php b/ecrire/inc_revisions.php
similarity index 100%
rename from ecrire/lab_revisions.php
rename to ecrire/inc_revisions.php
diff --git a/ecrire/inc_spip_action_joindre.php b/ecrire/inc_spip_action_joindre.php
index d083c0fd64..4fd66afc19 100644
--- a/ecrire/inc_spip_action_joindre.php
+++ b/ecrire/inc_spip_action_joindre.php
@@ -137,7 +137,7 @@ function spip_action_joindre6($arg, $mode, $type, $id, $id_document,$hash, $id_a
{
define('_tmp_dir', creer_repertoire_documents($hash));
if (_tmp_dir == _DIR_DOC) die(_L('Opération impossible'));
- include_ecrire('pclzip.lib');
+ include_ecrire('inc_pclzip');
$archive = new PclZip($arg);
$archive->extract(
PCLZIP_OPT_PATH, _tmp_dir,
diff --git a/ecrire/inc_suivi_versions.php b/ecrire/inc_suivi_versions.php
index 435b4d7097..4b021b4afa 100644
--- a/ecrire/inc_suivi_versions.php
+++ b/ecrire/inc_suivi_versions.php
@@ -12,8 +12,8 @@
if (!defined("_ECRIRE_INC_VERSION")) return;
-include_ecrire("lab_revisions");
-include_ecrire("lab_diff");
+include_ecrire("inc_revisions");
+include_ecrire("inc_diff");
function afficher_para_modifies ($texte, $court = false) {
// Limiter la taille de l'affichage
--
GitLab