From 5b1ce9d719e9341b476940c074ecb84c19d3072f Mon Sep 17 00:00:00 2001
From: Fil <fil@rezo.net>
Date: Fri, 27 Jan 2006 13:44:14 +0000
Subject: [PATCH] =?UTF-8?q?patch=20our=20=C3=A9crans=20admin/=20(C=C3=A9dr?=
=?UTF-8?q?ic)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/exec_admin_repair.php | 2 +-
ecrire/exec_admin_tech.php | 5 ++---
ecrire/exec_delete_all.php | 2 +-
ecrire/exec_export_all.php | 2 +-
ecrire/exec_import_all.php | 10 ++++------
ecrire/exec_install.php | 2 +-
ecrire/exec_upgrade.php | 2 +-
ecrire/inc_admin.php | 4 ++--
ecrire/inc_config.php | 2 +-
9 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/ecrire/exec_admin_repair.php b/ecrire/exec_admin_repair.php
index e0f12596c7..29d2848fa1 100644
--- a/ecrire/exec_admin_repair.php
+++ b/ecrire/exec_admin_repair.php
@@ -82,7 +82,7 @@ else {
$action = _T('texte_tenter_reparation');
if ($ok) {
- debut_admin($action, $message);
+ debut_admin(generer_url_post_ecrire("admin_repair"), $action, $message);
if (! $res = verifier_base())
$res = "<br><br><font color='red'><b><tt>"._T('avis_erreur_mysql').' '.spip_sql_errno().': '.spip_sql_error() ."</tt></b></font><br /><br /><br />\n";
diff --git a/ecrire/exec_admin_tech.php b/ecrire/exec_admin_tech.php
index 1738733496..58f7a49a3e 100644
--- a/ecrire/exec_admin_tech.php
+++ b/ecrire/exec_admin_tech.php
@@ -100,9 +100,8 @@ echo "<TABLE BORDER=0 CELLSPACING=1 CELLPADDING=8 WIDTH=\"100%\">",
"<FONT FACE='Verdana,Arial,Sans,sans-serif' SIZE=3 COLOR='#000000'>",
_T('texte_restaurer_base')."</FONT></B></TD></TR>",
"<TR><td class='serif'>\n",
- "<form method='get' action='",
- generer_url_ecrire("import_all"),
- "'>\n<p align='justify'> ",
+ generer_url_post_ecrire("import_all"),
+ "\n<p align='justify'> ",
_T('texte_restaurer_sauvegarde'),
"\n<p>",
_T('entree_nom_fichier', array('texte_compresse' => $texte_compresse)),
diff --git a/ecrire/exec_delete_all.php b/ecrire/exec_delete_all.php
index d3b1e3daa1..5a9737910d 100644
--- a/ecrire/exec_delete_all.php
+++ b/ecrire/exec_delete_all.php
@@ -18,7 +18,7 @@ function delete_all_dist()
{
$action = _T('titre_page_delete_all');
-debut_admin($action);
+debut_admin(generer_url_post_ecrire("delete_all"), $action);
// faudrait plutot recuperer dans inc_serialbase et inc_auxbase
// mais il faudra prevenir ceux qui affectent les globales qui s'y trouvent
diff --git a/ecrire/exec_export_all.php b/ecrire/exec_export_all.php
index 2ed752592c..2489d11fc7 100644
--- a/ecrire/exec_export_all.php
+++ b/ecrire/exec_export_all.php
@@ -26,7 +26,7 @@ if (!$archive) {
$action = _T('info_exportation_base', array('archive' => $archive));
-debut_admin($action);
+debut_admin(generer_url_post_ecrire("export_all","archive=$archive"), $action);
$debug_limit = '';
diff --git a/ecrire/exec_import_all.php b/ecrire/exec_import_all.php
index b8ff85d918..b317608016 100644
--- a/ecrire/exec_import_all.php
+++ b/ecrire/exec_import_all.php
@@ -39,14 +39,13 @@ function verifier_version_sauvegarde ($archive) {
function import_all_dist()
{
- global $archive;
- if ($archive) {
+ global $archive;
+ if ($archive) {
$action = _T('info_restauration_sauvegarde', array('archive' => $archive));
$commentaire = verifier_version_sauvegarde ($archive);
-}
-
- debut_admin($action, $commentaire);
+ }
+ debut_admin(generer_url_post_ecrire("import_all","archive=$archive"), $action, $commentaire);
$archive = _DIR_SESSIONS . $archive;
@@ -56,7 +55,6 @@ function import_all_dist()
ecrire_metas();
fin_admin($action);
-
header("Location: ./");
}
?>
diff --git a/ecrire/exec_install.php b/ecrire/exec_install.php
index 70d5fe630e..6200fc4b77 100644
--- a/ecrire/exec_install.php
+++ b/ecrire/exec_install.php
@@ -755,7 +755,7 @@ function install_unpack()
$action = _T('texte_unpack');
- debut_admin($action);
+ debut_admin(generer_url_post_ecrire("install"),$action);
$hash = calculer_action_auteur("unpack");
diff --git a/ecrire/exec_upgrade.php b/ecrire/exec_upgrade.php
index 699cf27592..7b4039a001 100644
--- a/ecrire/exec_upgrade.php
+++ b/ecrire/exec_upgrade.php
@@ -65,7 +65,7 @@ function upgrade_dist()
include_ecrire('inc_admin');
- debut_admin($upgrade_titre, $commentaire);
+ debut_admin(generer_url_post_ecrire("upgrade"),$upgrade_titre, $commentaire);
include_ecrire ("inc_base");
diff --git a/ecrire/inc_admin.php b/ecrire/inc_admin.php
index ab4204d791..6fb347a17d 100644
--- a/ecrire/inc_admin.php
+++ b/ecrire/inc_admin.php
@@ -17,7 +17,7 @@ function fichier_admin($action) {
return "admin_".substr(md5($action.(time() & ~2047).$connect_login), 0, 10);
}
-function debut_admin($action, $commentaire='') {
+function debut_admin($form, $action, $commentaire='') {
global $clean_link;
global $connect_statut;
@@ -37,7 +37,7 @@ function debut_admin($action, $commentaire='') {
include_ecrire ("inc_minipres");
minipres(_T('info_action', array('action' => $action)),
$commentaire
- . $clean_link->getForm('POST')
+ . $form
. "\n<p><b>"._T('info_authentification_ftp')."</b>"
. aide("ftp_auth")
. "\n<p>"
diff --git a/ecrire/inc_config.php b/ecrire/inc_config.php
index 64beeed641..933a04ab96 100644
--- a/ecrire/inc_config.php
+++ b/ecrire/inc_config.php
@@ -289,7 +289,7 @@ function appliquer_modifs_config() {
if ($modif_secu) {
$admin = _T('info_modification_parametres_securite');
include_ecrire ("inc_admin");
- debut_admin($admin);
+ debut_admin(generer_url_post_ecrire($_GET['exec']),$admin); # si ca se trouve ca marche ...
reset($liste_meta);
while (list(,$i) = each($liste_meta))
if (isset($GLOBALS[$i])) ecrire_meta($i, $GLOBALS[$i]);
--
GitLab