From fd4cc5e4325dabe80de36394ecfc775f12d2d2fc Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Wed, 4 Apr 2012 07:55:39 +0000
Subject: [PATCH] Renommer les occurences de extensions en plugins_dist : -
_DIR_EXTENSIONS et _ROOT_EXTENTSIONS - dans les chaines de langue
---
ecrire/exec/admin_plugin.php | 16 ++++++++--------
ecrire/exec/info_plugin.php | 4 ++--
ecrire/inc/plugin.php | 10 +++++-----
ecrire/inc/utils.php | 4 ++--
ecrire/install/etape_4.php | 4 ++--
ecrire/plugins/afficher_plugin.php | 4 ++--
ecrire/public/quete.php | 6 +++---
prive/formulaires/configurer_metas.php | 2 +-
8 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/ecrire/exec/admin_plugin.php b/ecrire/exec/admin_plugin.php
index 814bb764b8..f0c47b4273 100644
--- a/ecrire/exec/admin_plugin.php
+++ b/ecrire/exec/admin_plugin.php
@@ -134,7 +134,7 @@ function admin_plug_args($quoi, $erreur, $format)
echo fin_cadre_trait_couleur(true);
if ($quoi=='actifs')
- echo affiche_les_extensions($actifs);
+ echo affiche_les_plugins_verrouilles($actifs);
echo "</div>";
echo http_script("
@@ -173,19 +173,19 @@ function admin_plug_args($quoi, $erreur, $format)
echo fin_gauche(), fin_page();
}
-function affiche_les_extensions($actifs)
+function affiche_les_plugins_verrouilles($actifs)
{
- if ((!$liste = liste_plugin_files(_DIR_EXTENSIONS))) return '';
+ if ((!$liste = liste_plugin_files(_DIR_PLUGINS_DIST))) return '';
$afficher = charger_fonction("afficher_liste",'plugins');
- $liste = $afficher(self(), $liste, array(), $actifs, _DIR_EXTENSIONS);
+ $liste = $afficher(self(), $liste, array(), $actifs, _DIR_PLUGINS_DIST);
return
- "<div id='extensions'>"
- . debut_cadre_trait_couleur('',true,'',_T('plugins_liste_extensions'), 'liste_extensions')
+ "<div id='plugins_dist'>"
+ . debut_cadre_trait_couleur('',true,'',_T('plugins_liste_dist'), 'liste_plugins_dist')
. "<p>"
- . _T('plugin_info_extension_1', array('extensions' => joli_repertoire(_DIR_EXTENSIONS)))
- . '<br />'. _T('plugin_info_extension_2')
+ . _T('plugin_info_plugins_dist_1', array('plugins_dist' => joli_repertoire(_DIR_PLUGINS_DIST)))
+ . '<br />'. _T('plugin_info_plugins_dist_2')
. "</p>"
. $liste
. fin_cadre_trait_couleur(true)
diff --git a/ecrire/exec/info_plugin.php b/ecrire/exec/info_plugin.php
index ffddc49846..0a93b48d25 100644
--- a/ecrire/exec/info_plugin.php
+++ b/ecrire/exec/info_plugin.php
@@ -14,8 +14,8 @@ function exec_info_plugin_dist() {
$dir = "";
if (strncmp($plug,_DIR_PLUGINS,strlen(_DIR_PLUGINS))==0)
$dir = _DIR_PLUGINS;
- elseif (strncmp($plug,_DIR_EXTENSIONS,strlen(_DIR_EXTENSIONS))==0)
- $dir = _DIR_EXTENSIONS;
+ elseif (strncmp($plug,_DIR_PLUGINS_DIST,strlen(_DIR_PLUGINS_DIST))==0)
+ $dir = _DIR_PLUGINS_DIST;
if ($dir)
$plug = substr($plug,strlen($dir));
$info = $get_infos($plug,false,$dir);
diff --git a/ecrire/inc/plugin.php b/ecrire/inc/plugin.php
index aa3b707343..68b52f1146 100644
--- a/ecrire/inc/plugin.php
+++ b/ecrire/inc/plugin.php
@@ -19,7 +19,7 @@ define('_DIR_PLUGINS_AUTO', _DIR_PLUGINS.'auto/');
include_spip('plugins/installer');
// lecture des sous repertoire plugin existants
-// $dir_plugins pour forcer un repertoire (ex: _DIR_EXTENSIONS)
+// $dir_plugins pour forcer un repertoire (ex: _DIR_PLUGINS_DIST)
// _DIR_PLUGINS_SUPPL pour aller en chercher ailleurs
// (chemins relatifs a la racine du site, separes par des ":")
// http://doc.spip.org/@liste_plugin_files
@@ -147,11 +147,11 @@ function plugin_version_compatible($intervalle,$version){
// http://doc.spip.org/@liste_plugin_valides
function liste_plugin_valides($liste_plug, $force = false)
{
- $liste_ext = liste_plugin_files(_DIR_EXTENSIONS);
+ $liste_ext = liste_plugin_files(_DIR_PLUGINS_DIST);
$get_infos = charger_fonction('get_infos','plugins');
$infos = array(
// lister les extensions qui sont automatiquement actives
- '_DIR_EXTENSIONS' => $get_infos($liste_ext, $force, _DIR_EXTENSIONS),
+ '_DIR_PLUGINS_DIST' => $get_infos($liste_ext, $force, _DIR_PLUGINS_DIST),
'_DIR_PLUGINS' => $get_infos($liste_plug, $force, _DIR_PLUGINS)
);
@@ -170,8 +170,8 @@ function liste_plugin_valides($liste_plug, $force = false)
);
foreach($liste_ext as $plug){
- if (isset($infos['_DIR_EXTENSIONS'][$plug]))
- plugin_valide_resume($liste_non_classee, $plug, $infos, '_DIR_EXTENSIONS');
+ if (isset($infos['_DIR_PLUGINS_DIST'][$plug]))
+ plugin_valide_resume($liste_non_classee, $plug, $infos, '_DIR_PLUGINS_DIST');
}
foreach($liste_plug as $plug) {
if (isset($infos['_DIR_PLUGINS'][$plug]))
diff --git a/ecrire/inc/utils.php b/ecrire/inc/utils.php
index 4c8e2d366c..64776d7c21 100644
--- a/ecrire/inc/utils.php
+++ b/ecrire/inc/utils.php
@@ -1418,7 +1418,7 @@ function spip_initialisation_core($pi=NULL, $pa=NULL, $ti=NULL, $ta=NULL) {
if (!defined('_DIR_PLUGINS')) define('_DIR_PLUGINS', _DIR_RACINE . "plugins/");
// le nom du repertoire des extensions/ permanentes du core, toujours actives
- if (!defined('_DIR_EXTENSIONS')) define('_DIR_EXTENSIONS', _DIR_RACINE . "plugins-dist/");
+ if (!defined('_DIR_PLUGINS_DIST')) define('_DIR_PLUGINS_DIST', _DIR_RACINE . "plugins-dist/");
// le nom du repertoire des librairies
if (!defined('_DIR_LIB')) define('_DIR_LIB', _DIR_RACINE . "lib/");
@@ -1491,7 +1491,7 @@ function spip_initialisation_core($pi=NULL, $pa=NULL, $ti=NULL, $ta=NULL) {
// Le charset par defaut lors de l'installation
if (!defined('_DEFAULT_CHARSET')) define('_DEFAULT_CHARSET', 'utf-8');
if (!defined('_ROOT_PLUGINS')) define('_ROOT_PLUGINS', _ROOT_RACINE . "plugins/");
- if (!defined('_ROOT_EXTENSIONS')) define('_ROOT_EXTENSIONS', _ROOT_RACINE . "plugins-dist/");
+ if (!defined('_ROOT_PLUGINS_DIST')) define('_ROOT_PLUGINS_DIST', _ROOT_RACINE . "plugins-dist/");
// La taille des Log
if (!defined('_MAX_LOG')) define('_MAX_LOG', 100);
diff --git a/ecrire/install/etape_4.php b/ecrire/install/etape_4.php
index c35493b0a1..5aed2cab70 100644
--- a/ecrire/install/etape_4.php
+++ b/ecrire/install/etape_4.php
@@ -36,13 +36,13 @@ function install_etape_4_dist()
echo "<p>"
- ._T('plugin_info_extension_1', array('extensions' => joli_repertoire(_DIR_EXTENSIONS)))
+ ._T('plugin_info_plugins_dist_1', array('extensions' => joli_repertoire(_DIR_PLUGINS_DIST)))
."</p>";
// installer les extensions
include_spip('inc/plugin');
$afficher = charger_fonction("afficher_liste",'plugins');
- echo $afficher(self(), liste_plugin_files(_DIR_EXTENSIONS),array(), array(), _DIR_EXTENSIONS,'afficher_nom_plugin');
+ echo $afficher(self(), liste_plugin_files(_DIR_PLUGINS_DIST),array(), array(), _DIR_PLUGINS_DIST,'afficher_nom_plugin');
plugin_installes_meta();
diff --git a/ecrire/plugins/afficher_plugin.php b/ecrire/plugins/afficher_plugin.php
index 842d84a86f..68ac34a2ed 100644
--- a/ecrire/plugins/afficher_plugin.php
+++ b/ecrire/plugins/afficher_plugin.php
@@ -26,7 +26,7 @@ function plugins_afficher_plugin_dist($url_page, $plug_file, $checked, $actif, $
$info = $get_infos($plug_file, $force_reload, $dir_plugins);
$prefix = $info['prefix'];
$cfg = "";
- $checkable = ($dir_plugins!==_DIR_EXTENSIONS);
+ $checkable = ($dir_plugins!==_DIR_PLUGINS_DIST);
$nom = plugin_nom($info,$dir_plugins,$plug_file);
if (!plugin_version_compatible($info['compatibilite'], $GLOBALS['spip_version_branche'])){
@@ -59,7 +59,7 @@ function plugins_afficher_plugin_dist($url_page, $plug_file, $checked, $actif, $
. plugin_resume($info, $dir_plugins, $plug_file, $url_page)
. $cfg
. $erreur
- . (($dir_plugins!==_DIR_EXTENSIONS AND plugin_est_installe($plug_file))
+ . (($dir_plugins!==_DIR_PLUGINS_DIST AND plugin_est_installe($plug_file))
? plugin_desintalle($plug_file,$nom) : '')
. "<div class='details'>" // pour l'ajax de exec/info_plugin
. (!$expose ? '' : affiche_bloc_plugin($plug_file, $info))
diff --git a/ecrire/public/quete.php b/ecrire/public/quete.php
index 56aeb7588d..3d526b1e37 100644
--- a/ecrire/public/quete.php
+++ b/ecrire/public/quete.php
@@ -276,9 +276,9 @@ function quete_logo_file($row, $connect=NULL) {
$logo = $f($row['extension'], false);
}
// si c'est une vignette type doc, la renvoyer direct
- if (strncmp($logo,_DIR_PLUGINS, strlen(_DIR_PLUGINS))==0
- OR strncmp($logo,_DIR_EXTENSIONS, strlen(_DIR_EXTENSIONS))==0
- OR strncmp($logo,_DIR_RACINE.'prive/', strlen(_DIR_RACINE.'prive/'))==0)
+ if (strcmp($logo,_DIR_PLUGINS)==0
+ OR strcmp($logo,_DIR_PLUGINS_DIST)==0
+ OR strcmp($logo,_DIR_RACINE.'prive/')==0)
return $logo;
return get_spip_doc($logo);
}
diff --git a/prive/formulaires/configurer_metas.php b/prive/formulaires/configurer_metas.php
index 8f8654359a..c18557d785 100644
--- a/prive/formulaires/configurer_metas.php
+++ b/prive/formulaires/configurer_metas.php
@@ -69,7 +69,7 @@ function formulaires_configurer_metas_recense($form, $opt='')
// Attention a l'ordre:
// si l'un des 3 est un sous-rep d'un autre, le mettre avant.
-define('_EXTRAIRE_PLUGIN', '@(' . _DIR_PLUGINS_AUTO . '|' . _DIR_PLUGINS . '|' . _DIR_EXTENSIONS .')/?([^/]+)/@');
+define('_EXTRAIRE_PLUGIN', '@(' . _DIR_PLUGINS_AUTO . '|' . _DIR_PLUGINS . '|' . _DIR_PLUGINS_DIST .')/?([^/]+)/@');
// Recuperer la version compilee de plugin.xml et normaliser
// Si ce n'est pas un plugin, dire qu'il faut prendre la table std des meta.
--
GitLab