From 1c69cae891f1f54abae5c2eed3f98068c8e6d33f Mon Sep 17 00:00:00 2001
From: Matthieu Marcillaud <marcimat@rezo.net>
Date: Tue, 21 Mar 2023 21:30:04 +0100
Subject: [PATCH] remove: Fonctions qui servaient au navigateur Internet
Explorer
Suppression, car inutile de :
- `verif_butineur()`
- `editer_texte_recolle()`
- Et environnement `_texte_trop_long` des formulaires
Refs: #5505
---
ecrire/inc/editer.php | 33 +-----------
ecrire/inc/layer.php | 69 --------------------------
prive/formulaires/editer_article.html | 2 +-
prive/formulaires/editer_rubrique.html | 1 -
4 files changed, 2 insertions(+), 103 deletions(-)
diff --git a/ecrire/inc/editer.php b/ecrire/inc/editer.php
index bb64006f14..86d7d7319d 100644
--- a/ecrire/inc/editer.php
+++ b/ecrire/inc/editer.php
@@ -298,9 +298,7 @@ function formulaires_editer_objet_charger(
. " rows='"
. ($config['lignes'] + 15)
. "' cols='40'";
- if (isset($contexte['texte'])) {
- [$contexte['texte'], $contexte['_texte_trop_long']] = editer_texte_recolle($contexte['texte'], $att_text);
- }
+
// on veut conserver la langue de l'interface ;
// on passe cette donnee sous un autre nom, au cas ou le squelette
@@ -379,35 +377,6 @@ function coupe_trop_long($texte) {
}
}
-/**
- * Formater un `$texte` dans `textarea`
- *
- * @param string $texte
- * @param string $att_text
- * @return array
- */
-function editer_texte_recolle($texte, $att_text) {
- if (
- strlen($texte) < 29 * 1024
- || include_spip('inc/layer') && $GLOBALS['browser_name'] != 'MSIE'
- ) {
- return [$texte, ''];
- }
-
- include_spip('inc/barre');
- $textes_supplement = "<br /><span style='color: red'>" . _T('info_texte_long') . "</span>\n";
- $nombre = 0;
-
- while (strlen((string) $texte) > 29 * 1024) {
- $nombre++;
- [$texte1, $texte] = coupe_trop_long($texte);
- $textes_supplement .= '<br />' .
- "<textarea id='texte$nombre' name='texte_plus[$nombre]'$att_text>$texte1</textarea>\n";
- }
-
- return [$texte, $textes_supplement];
-}
-
/**
* auto-renseigner le titre si il n'existe pas
*
diff --git a/ecrire/inc/layer.php b/ecrire/inc/layer.php
index 89fd41e331..7fbbca1062 100644
--- a/ecrire/inc/layer.php
+++ b/ecrire/inc/layer.php
@@ -90,72 +90,3 @@ function bouton_block_depliable($texte, $deplie, $ids = '') {
? "jQuery(function($){if ($('$cible').is(':visible')) { $('#$bouton_id').addClass('deplie').removeClass('replie'); }});"
: '');
}
-
-//
-// Tests sur le nom du butineur
-//
-function verif_butineur() {
-
- preg_match(',^([A-Za-z]+)/(\d+\.\d+) (.*)$,', (string) $_SERVER['HTTP_USER_AGENT'], $match);
- $GLOBALS['browser_name'] = $match[1];
- $GLOBALS['browser_version'] = $match[2];
- $GLOBALS['browser_description'] = $match[3];
- $GLOBALS['browser_layer'] = ' '; // compat avec vieux scripts qui testent la valeur
- $GLOBALS['browser_barre'] = '';
-
- if (!preg_match(',opera,i', (string) $GLOBALS['browser_description']) && preg_match(',opera,i', (string) $GLOBALS['browser_name'])) {
- $GLOBALS['browser_name'] = 'Opera';
- $GLOBALS['browser_version'] = $match[2];
- $GLOBALS['browser_barre'] = ($GLOBALS['browser_version'] >= 8.5);
- } else {
- if (preg_match(',opera,i', (string) $GLOBALS['browser_description'])) {
- preg_match(',Opera ([^\ ]*),i', (string) $GLOBALS['browser_description'], $match);
- $GLOBALS['browser_name'] = 'Opera';
- $GLOBALS['browser_version'] = $match[1];
- $GLOBALS['browser_barre'] = ($GLOBALS['browser_version'] >= 8.5);
- } else {
- if (preg_match(',msie,i', (string) $GLOBALS['browser_description'])) {
- preg_match(',MSIE ([^;]*),i', (string) $GLOBALS['browser_description'], $match);
- $GLOBALS['browser_name'] = 'MSIE';
- $GLOBALS['browser_version'] = $match[1];
- $GLOBALS['browser_barre'] = ($GLOBALS['browser_version'] >= 5.5);
- } else {
- if (
- preg_match(',KHTML,i', (string) $GLOBALS['browser_description']) &&
- preg_match(',Safari/([^;]*),', (string) $GLOBALS['browser_description'], $match)
- ) {
- $GLOBALS['browser_name'] = 'Safari';
- $GLOBALS['browser_version'] = $match[1];
- $GLOBALS['browser_barre'] = ($GLOBALS['browser_version'] >= 5.0);
- } else {
- if (preg_match(',mozilla,i', (string) $GLOBALS['browser_name']) && $GLOBALS['browser_version'] >= 5) {
- // Numero de version pour Mozilla "authentique"
- if (preg_match(',rv:(\d+\.\d+),', (string) $GLOBALS['browser_description'], $match)) {
- $GLOBALS['browser_rev'] = (float) $match[1];
- } // Autres Gecko => equivalents 1.4 par defaut (Galeon, etc.)
- else {
- if (
- strpos((string) $GLOBALS['browser_description'], 'Gecko') && !strpos(
- (string) $GLOBALS['browser_description'],
- 'KHTML'
- )
- ) {
- $GLOBALS['browser_rev'] = 1.4;
- } // Machins quelconques => equivalents 1.0 par defaut (Konqueror, etc.)
- else {
- $GLOBALS['browser_rev'] = 1.0;
- }
- }
- $GLOBALS['browser_barre'] = $GLOBALS['browser_rev'] >= 1.3;
- }
- }
- }
- }
- }
-
- if (!$GLOBALS['browser_name']) {
- $GLOBALS['browser_name'] = 'Mozilla';
- }
-}
-
-verif_butineur();
diff --git a/prive/formulaires/editer_article.html b/prive/formulaires/editer_article.html
index b766fb6e5c..70582b3f27 100644
--- a/prive/formulaires/editer_article.html
+++ b/prive/formulaires/editer_article.html
@@ -67,7 +67,7 @@
<div class="editer editer_texte obligatoire[ (#ENV*{erreurs/texte}|oui)erreur]">
<label for="text_area"><:info_texte:><em class="aide">#AIDER{text_area}</em></label>[
<span class='erreur_message'>(#ENV*{erreurs/texte})</span>
- ][(#ENV{_texte_trop_long,''})]
+ ]
<textarea name='texte' id='text_area'[ lang='(#LANGUE)'] rows='[(#ENV{config/lignes}|plus{2})]' cols='40'>[(#ENV{texte})]</textarea>
</div>]
[(#CONFIG{articles_ps}|=={non}|?{#ENV{ps,''},' '}|oui)
diff --git a/prive/formulaires/editer_rubrique.html b/prive/formulaires/editer_rubrique.html
index 6842d9949f..de96deb62a 100644
--- a/prive/formulaires/editer_rubrique.html
+++ b/prive/formulaires/editer_rubrique.html
@@ -29,7 +29,6 @@
<div class="editer editer_texte[ (#ENV*{erreurs/texte}|oui)erreur]">
<label for="text_area"><:info_texte_explicatif:><em class="aide">#AIDER{text_area}</em></label>[
<span class='erreur_message'>(#ENV*{erreurs/texte})</span>
- ][(#ENV{_texte_trop_long,''})
]<textarea name='texte' id='text_area' rows='[(#ENV{config/lignes}|plus{2})]' cols='40'>[(#ENV{texte})]</textarea>
</div>]
</div>
--
GitLab