From c4131a6d0a6f4f56c3243cc531ebdf4ce503b341 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Wed, 25 Apr 2007 21:52:48 +0000
Subject: [PATCH] "renumeroter les scripts d'install"
---
.gitattributes | 4 ++--
ecrire/install/etape_2.php | 2 +-
ecrire/install/{etape_5.php => etape_3.php} | 8 ++++----
ecrire/install/{etape_6.php => etape_4.php} | 5 ++---
4 files changed, 9 insertions(+), 10 deletions(-)
rename ecrire/install/{etape_5.php => etape_3.php} (97%)
rename ecrire/install/{etape_6.php => etape_4.php} (97%)
diff --git a/.gitattributes b/.gitattributes
index 0e71d0ebb5..d94bb602f1 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -595,8 +595,8 @@ ecrire/inc/xml.php -text
ecrire/install/etape_.php -text
ecrire/install/etape_1.php -text
ecrire/install/etape_2.php -text
-ecrire/install/etape_5.php -text
-ecrire/install/etape_6.php -text
+ecrire/install/etape_3.php -text
+ecrire/install/etape_4.php -text
ecrire/install/etape_ldap1.php -text
ecrire/install/etape_ldap2.php -text
ecrire/install/etape_ldap3.php -text
diff --git a/ecrire/install/etape_2.php b/ecrire/install/etape_2.php
index a7c67ed617..211b2a16f4 100644
--- a/ecrire/install/etape_2.php
+++ b/ecrire/install/etape_2.php
@@ -79,7 +79,7 @@ function install_etape_2_dist()
}
echo generer_post_ecrire('install', (
- "\n<input type='hidden' name='etape' value='5' />"
+ "\n<input type='hidden' name='etape' value='3' />"
. "\n<input type='hidden' name='chmod' value='$chmod' />"
. "\n<input type='hidden' name='adresse_db' value=\"$adresse_db\" />"
. "\n<input type='hidden' name='login_db' value=\"$login_db\" />"
diff --git a/ecrire/install/etape_5.php b/ecrire/install/etape_3.php
similarity index 97%
rename from ecrire/install/etape_5.php
rename to ecrire/install/etape_3.php
index d4b5728bad..358b395383 100644
--- a/ecrire/install/etape_5.php
+++ b/ecrire/install/etape_3.php
@@ -104,8 +104,8 @@ function install_bases(){
return $result_ok;
}
-// http://doc.spip.org/@inc_install_5
-function install_etape_5_dist()
+
+function install_etape_3_dist()
{
global $email, $ldap_present, $login, $nom, $pass, $spip_lang_right;
@@ -134,7 +134,7 @@ function install_etape_5_dist()
echo generer_post_ecrire('install', (
- "\n<input type='hidden' name='etape' value='6' />"
+ "\n<input type='hidden' name='etape' value='4' />"
. fieldset(_T('info_identification_publique'),
array(
@@ -188,7 +188,7 @@ function install_etape_5_dist()
echo "<p class='resultat'><b>"._T('avis_operation_echec')."</b></p>"._T('texte_operation_echec');
}
- echo info_progression_etape(5,'etape_','install/');
+ echo info_progression_etape(3,'etape_','install/');
echo install_fin_html();
}
diff --git a/ecrire/install/etape_6.php b/ecrire/install/etape_4.php
similarity index 97%
rename from ecrire/install/etape_6.php
rename to ecrire/install/etape_4.php
index 55ab94f40b..7582f876c8 100644
--- a/ecrire/install/etape_6.php
+++ b/ecrire/install/etape_4.php
@@ -14,8 +14,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return; #securite
include_spip('inc/headers');
-// http://doc.spip.org/@inc_install_6
-function install_etape_6_dist()
+function install_etape_4_dist()
{
global $email,$login,$nom,$pass, $pass_verif,$spip_lang_right;
@@ -107,7 +106,7 @@ function install_etape_6_dist()
echo bouton_suivant();
echo "</div></form>";
- echo info_progression_etape(6,'etape_','install/');
+ echo info_progression_etape(4,'etape_','install/');
echo install_fin_html();
}
--
GitLab