diff --git a/ecrire/exec/admin_declarer.php b/ecrire/exec/admin_declarer.php index a88c12e9f830da95fdd94b1b77715179d87587f5..6144ffa4b8857f1632ce1d260791eade7012db65 100644 --- a/ecrire/exec/admin_declarer.php +++ b/ecrire/exec/admin_declarer.php @@ -24,7 +24,7 @@ function exec_admin_declarer_dist() } else { $commencer_page = charger_fonction('commencer_page', 'inc'); - echo $commencer_page(_T('titre_page_admin_effacer'), "configuration", "base"); + echo $commencer_page(_T('titre_admin_tech'), "configuration", "base"); echo "\n<br /><br />"; echo gros_titre(_T('titre_admin_effacer'),'',false); diff --git a/ecrire/inc/install.php b/ecrire/inc/install.php index dbb8bb86aae56de4bb16d086b607169c70a4d13a..a0bf4cb20b905a245d9f2cbefb0a79564200738b 100644 --- a/ecrire/inc/install.php +++ b/ecrire/inc/install.php @@ -274,7 +274,7 @@ function install_connexion_form($db, $login, $pass, $predef, $hidden, $etape) // le cacher si l'installation est predefinie avec un serveur particulier if ($predef[0]) { - $server_db = _INSTALL_SERVER_DB; + $server_db = $predef[0]; } return generer_form_ecrire('install', ( @@ -286,7 +286,7 @@ function install_connexion_form($db, $login, $pass, $predef, $hidden, $etape) :"") . http_script('', 'jquery.js') - . '<script language="javascript"><!-- + . http_script(' $(document).ready(function() { $("input[@type=hidden][@name=server_db]").each(function(){ if ($(this).attr("value").match("sqlite*")){ @@ -306,8 +306,7 @@ function install_connexion_form($db, $login, $pass, $predef, $hidden, $etape) $("#install_pass_base_hebergeur").show(); } }); - }); - // --></script>' + });') . ($server_db ? '<input type="hidden" name="server_db" value="'.$server_db.'" />' diff --git a/ecrire/install/etape_sup1.php b/ecrire/install/etape_sup1.php index 7d344ac662a03d8df306d54c5dcd2691fe5bb758..1ae29ea109c2671893319daeb6987ff50ad113bd 100644 --- a/ecrire/install/etape_sup1.php +++ b/ecrire/install/etape_sup1.php @@ -43,8 +43,8 @@ function install_etape_sup1_dist() // pour qu'on la refuse comme choix de base secondaire $sel_db =_request('sel_db'); - if (!$server_d AND defined('_INSTALL_SERVER_DB')) - $server_d = _INSTALL_NAME_DB; + if (!$sel_db AND defined('_INSTALL_NAME_DB')) + $sel_db = _INSTALL_NAME_DB; echo install_debut_html(_T('config_titre_base_sup'));