nstall step Please enter the commit message for your changes. Lines starting

This commit is contained in:
Manuel Raynaud
2013-09-17 15:43:15 +02:00
parent 35299dd6be
commit 072dec5cc9
7 changed files with 85 additions and 38 deletions

View File

@@ -21,12 +21,12 @@
/* */
/*************************************************************************************/
$step = 4;
$step = 5;
include("header.php");
global $thelia;
$err = isset($_GET['err']) && $_GET['err'];
if (!$err) {
if (!$err && $_SESSION['install']['step'] != $step) {
$checkConnection = new \Thelia\Install\CheckDatabaseConnection($_SESSION['install']['host'], $_SESSION['install']['username'], $_SESSION['install']['password'], $_SESSION['install']['port']);
$connection = $checkConnection->getConnection();
$connection->exec("SET NAMES UTF8");
@@ -41,10 +41,6 @@ if (!$err) {
$database->createDatabase($_SESSION['install']['database']);
}
if (!$connection->exec(sprintf('use %s', $_SESSION['install']['database']))) {
header('location: bdd.php?err=1');
}
$database->insertSql($_SESSION['install']['database']);
if(!file_exists(THELIA_ROOT . "/local/config/database.yml")) {
@@ -75,6 +71,8 @@ if (!$err) {
}
}
$_SESSION['install']['step'] = $step;
?>
<form action="end.php" method="POST" >
<div class="well">
@@ -98,13 +96,15 @@ if (!$err) {
<label for="site_name">Site name :</label>
<input id="site_name" class="form-control" type="text" name="site_name" placeholder="" value="" required>
</div>
<div class="form-group">
<label for="site_name">Site name :</label>
<input id="site_name" class="form-control" type="text" name="site_name" placeholder="" value="" required>
<div class="clearfix">
<div class="control-btn">
<button type="submit" class="pull-right btn btn-default btn-primary">Continue</button>
</div>
</div>
</div>
</form>
<?php include('footer.php'); ?>