From 8087a2784b0aa9bca8203f15c1894f5bb5ef4f36 Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Sat, 7 Oct 2006 13:15:01 +0000
Subject: [PATCH] =?UTF-8?q?Encore=20une=20petite=20simplification=20de=20i?=
=?UTF-8?q?ndex.php=20et=20des=20mises=20=C3=A0=20la=20retraite.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitattributes | 1 +
ecrire/exec/aide_index.php | 7 +++----
ecrire/exec/demande_mise_a_jour.php | 31 +++++++++++++++++++++++++++++
ecrire/inc/admin.php | 19 ------------------
ecrire/inc/layer.php | 6 ------
ecrire/inc/vieilles_defs.php | 10 ++++------
ecrire/index.php | 13 +++++-------
7 files changed, 44 insertions(+), 43 deletions(-)
create mode 100644 ecrire/exec/demande_mise_a_jour.php
diff --git a/.gitattributes b/.gitattributes
index e279d88759..7431830971 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -373,6 +373,7 @@ ecrire/exec/controle_petition.php -text
ecrire/exec/convert_utf8.php -text
ecrire/exec/dater.php -text
ecrire/exec/delete_all.php -text
+ecrire/exec/demande_mise_a_jour.php -text
ecrire/exec/discuter.php -text
ecrire/exec/documenter.php -text
ecrire/exec/documents_liste.php -text
diff --git a/ecrire/exec/aide_index.php b/ecrire/exec/aide_index.php
index 60d51b03d1..88007d2956 100644
--- a/ecrire/exec/aide_index.php
+++ b/ecrire/exec/aide_index.php
@@ -302,10 +302,9 @@ function activer_article(id) {
}
}
//--></script>
-';
-
- afficher_script_layer();
- echo '
+',
+ $GLOBALS['browser_layer'],
+ '
</head>
<body bgcolor="#FFFFFF" text="#000000" link="#E86519" vlink="#6E003A" alink="#FF9900" TOPMARGIN="5" LEFTMARGIN="5" MARGINWIDTH="5" MARGINHEIGHT="5"';
diff --git a/ecrire/exec/demande_mise_a_jour.php b/ecrire/exec/demande_mise_a_jour.php
new file mode 100644
index 0000000000..56b3e85982
--- /dev/null
+++ b/ecrire/exec/demande_mise_a_jour.php
@@ -0,0 +1,31 @@
+<?php
+
+/***************************************************************************\
+ * SPIP, Systeme de publication pour l'internet *
+ * *
+ * Copyright (c) 2001-2006 *
+ * Arnaud Martin, Antoine Pitrou, Philippe Riviere, Emmanuel Saint-James *
+ * *
+ * Ce programme est un logiciel libre distribue sous licence GNU/GPL. *
+ * Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne. *
+\***************************************************************************/
+
+if (!defined("_ECRIRE_INC_VERSION")) return;
+
+
+// http://doc.spip.org/@demande_maj_version
+function exec_demande_mise_a_jour_dist() {
+ include_spip('inc/presentation');
+ debut_page();
+ echo "<blockquote><blockquote><h4><font color='red'>",
+ _T('info_message_technique'),
+ "</font><br> ",
+ _T('info_procedure_maj_version'),
+ "</h4>",
+ _T('info_administrateur_site_01'),
+ " <a href='" . generer_url_ecrire("upgrade","reinstall=non") . "'>",
+ _T('info_administrateur_site_02'),
+ "</a></blockquote></blockquote><p>";
+ echo fin_page();
+}
+?>
diff --git a/ecrire/inc/admin.php b/ecrire/inc/admin.php
index 3df5c9a9d4..dd8b6cdf59 100644
--- a/ecrire/inc/admin.php
+++ b/ecrire/inc/admin.php
@@ -73,23 +73,4 @@ function fin_admin($action) {
@unlink($dir . $signal);
@rmdir($dir . $signal);
}
-
-
-// http://doc.spip.org/@demande_maj_version
-function demande_maj_version() {
- include_spip('inc/presentation');
- debut_page();
- echo "<blockquote><blockquote><h4><font color='red'>",
- _T('info_message_technique'),
- "</font><br> ",
- _T('info_procedure_maj_version'),
- "</h4>",
- _T('info_administrateur_site_01'),
- " <a href='" . generer_url_ecrire("upgrade","reinstall=non") . "'>",
- _T('info_administrateur_site_02'),
- "</a></blockquote></blockquote><p>";
- echo fin_page();
- exit;
-}
-
?>
diff --git a/ecrire/inc/layer.php b/ecrire/inc/layer.php
index d99fc0ccbd..6ca06a215f 100644
--- a/ecrire/inc/layer.php
+++ b/ecrire/inc/layer.php
@@ -236,12 +236,6 @@ function flag_svg() {
return ($browser_name == "Mozilla" AND $browser_rev >= 1.8);
}
-// Obsolete. Present pour compatibilite
-// http://doc.spip.org/@afficher_script_layer
-function afficher_script_layer(){echo $GLOBALS['browser_layer'];}
-// http://doc.spip.org/@test_layer
-function test_layer(){return $GLOBALS['browser_layer'];}
-
verif_butineur();
$GLOBALS['browser_caret'] = (!$GLOBALS['browser_barre'] ? '' : "
diff --git a/ecrire/inc/vieilles_defs.php b/ecrire/inc/vieilles_defs.php
index 3cf07f1e98..94bd15d806 100644
--- a/ecrire/inc/vieilles_defs.php
+++ b/ecrire/inc/vieilles_defs.php
@@ -21,7 +21,6 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
/* reecrites conformement a la nouvelle interface. */
-// http://doc.spip.org/@debut_raccourcis
function debut_raccourcis() {
global $spip_display;
echo "<div> </div>";
@@ -46,9 +45,6 @@ function fin_raccourcis() {
fin_cadre_enfonce();
}
-
-# fonction obsolete, assurant la compatilibite ascendante. cf include_spip
-// http://doc.spip.org/@include_ecrire
function include_ecrire($file, $silence=false) {
preg_match('/^((inc_)?([^.]*))(\.php[3]?)?$/', $file, $r);
@@ -67,8 +63,10 @@ function include_ecrire($file, $silence=false) {
return include_once($f);
}
-// Fonction abandonnee. . Ne plus utiliser, remplacer par son contenu
-// http://doc.spip.org/@lire_meta
function lire_meta($nom) { global $meta; return $meta[$nom];}
+function afficher_script_layer(){echo $GLOBALS['browser_layer'];}
+
+function test_layer(){return $GLOBALS['browser_layer'];}
+
?>
diff --git a/ecrire/index.php b/ecrire/index.php
index 775a29d7ad..789a2f4d6f 100644
--- a/ecrire/index.php
+++ b/ecrire/index.php
@@ -164,21 +164,18 @@ define('_TRANCHES', 10);
//
// Controle de la version, sauf si on est deja en train de s'en occuper
-if (!isset($reinstall)) {
- if ($spip_version <> ((double) str_replace(',','.',$GLOBALS['meta']['version_installee']))) {
- include_spip('inc/admin');
- demande_maj_version();
- }
-}
+if (!isset($reinstall)
+AND ($spip_version <> ((double) str_replace(',','.',$GLOBALS['meta']['version_installee']))))
+ $exec = 'demande_mise_a_jour';
// Controle d'interruption d'une longue restauration
-if ($_COOKIE['spip_admin']
+elseif ($_COOKIE['spip_admin']
AND isset($GLOBALS['meta']["debut_restauration"]))
$exec = 'import_all';
// Verification des plugins
// (ne pas interrompre une restauration ou un upgrade)
-if ($exec!='upgrade'
+elseif ($exec!='upgrade'
AND $auteur_session['statut']=='0minirezo'
AND lire_fichier(_DIR_TMP.'verifier_plugins.txt',$l)
AND $l = @unserialize($l)) {
--
GitLab