dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[*] IN : the installer can now attempt to create the database for you

Browse Source
This commit is contained in:
Damien Metzger
2013-07-03 11:04:34 +02:00
parent 92959311d9
commit bfa2f33c65
6 changed files with 380 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/controllers/http/database.php
+11 -19
View File
@@ -95,8 +95,8 @@ class InstallControllerHttpDatabase extends InstallControllerHttp
{
if (Tools::getValue('checkDb'))
$this->processCheckDb();
else if (Tools::getValue('sendMail'))
$this->processSendMail();
elseif (Tools::getValue('createDb'))
$this->processCreateDb();
}
/**
@@ -120,28 +120,20 @@ class InstallControllerHttpDatabase extends InstallControllerHttp
}
/**
* Send a test email
* Attempt to create the database
*/
public function processSendMail()
public function processCreateDb()
{
$smtp_checked = (Tools::getValue('smtpChecked') == 'true');
$server = Tools::getValue('smtpSrv');
$encryption = Tools::getValue('smtpEnc');
$port = Tools::getValue('smtpPort');
$login = Tools::getValue('smtpLogin');
$password = Tools::getValue('smtpPassword');
$email = Tools::getValue('testEmail');
$server = Tools::getValue('dbServer');
$database = Tools::getValue('dbName');
$login = Tools::getValue('dbLogin');
$password = Tools::getValue('dbPassword');
require_once _PS_INSTALL_MODELS_PATH_.'mail.php';
$this->model_mail = new InstallModelMail($smtp_checked, $server, $login, $password, $port, $encryption, $email);
$result = $this->model_mail->send(
$this->l('Test message from PrestaShop'),
$this->l('This is a test message, your server is now available to send email')
);
$success = $this->model_database->createDatabase($server, $database, $login, $password);
$this->ajaxJsonAnswer(
$result === false,
($result === false) ? $this->l('A test e-mail has been sent to %s', $email) : $this->l('An error occurred while sending email, please verify your parameters')
$success,
$success ? $this->l('Database is created') : $this->l('Cannot create the database automatically')
);
}
install-dev/models/database.php
+10 -1
View File
@@ -81,7 +81,10 @@ class InstallModelDatabase extends InstallAbstractModel
break;
case 2:
$errors[] = $this->language->l('Connection to MySQL server succeeded, but database "%s" not found', $database).$dbtype;
$errors[] = $this->language->l('Connection to MySQL server succeeded, but database "%s" not found', $database).$dbtype.'<br /><br />
'.sprintf('<input type="button" value="%s" class="button" id="btCreateDB">
<script type="text/javascript">bindCreateDB();</script>',
$this->language->l('Attempt to create the database automatically'));
break;
}
}
@@ -89,6 +92,12 @@ class InstallModelDatabase extends InstallAbstractModel
return $errors;
}
public function createDatabase($server, $database, $login, $password)
{
$class = Db::getClass();
return $class::createDatabase($server, $login, $password, $database);
}
public function getBestEngine($server, $database, $login, $password)
{
$class = Db::getClass();
install-dev/theme/js/database.js
+76 -39
View File
@@ -1,39 +1,76 @@
$(document).ready(function()
{
// Check database configuration
$('#btTestDB').click(function()
{
$("#dbResultCheck").slideUp('slow');
$.ajax({
url: 'index.php',
data: {
'checkDb': 'true',
'dbServer': $('#dbServer').val(),
'dbName': $('#dbName').val(),
'dbLogin': $('#dbLogin').val(),
'dbPassword': $('#dbPassword').val(),
'dbEngine': $('#dbEngine').val(),
'db_prefix': $('#db_prefix').val(),
'clear': $('#db_clear').prop('checked') ? '1' : '0'
},
dataType: 'json',
cache: false,
success: function(json)
{
$("#dbResultCheck")
.addClass((json.success) ? 'okBlock' : 'errorBlock')
.removeClass((json.success) ? 'errorBlock' : 'okBlock')
.html(json.message)
.slideDown('slow');
},
error: function(xhr)
{
$("#dbResultCheck")
.addClass('errorBlock')
.removeClass('okBlock')
.html('An error occurred:<br /><br />'+xhr.responseText)
.slideDown('slow');
}
});
});
});
$(document).ready(function()
{
// Check database configuration
$('#btTestDB').click(function()
{
$("#dbResultCheck").slideUp('slow');
$.ajax({
url: 'index.php',
data: {
'checkDb': 'true',
'dbServer': $('#dbServer').val(),
'dbName': $('#dbName').val(),
'dbLogin': $('#dbLogin').val(),
'dbPassword': $('#dbPassword').val(),
'dbEngine': $('#dbEngine').val(),
'db_prefix': $('#db_prefix').val(),
'clear': $('#db_clear').prop('checked') ? '1' : '0'
},
dataType: 'json',
cache: false,
success: function(json)
{
$("#dbResultCheck")
.addClass((json.success) ? 'okBlock' : 'errorBlock')
.removeClass((json.success) ? 'errorBlock' : 'okBlock')
.html(json.message)
.slideDown('slow');
},
error: function(xhr)
{
$("#dbResultCheck")
.addClass('errorBlock')
.removeClass('okBlock')
.html('An error occurred:<br /><br />' + xhr.responseText)
.slideDown('slow');
}
});
});
});
function bindCreateDB()
{
// Attempt to create the database
$('#btCreateDB').click(function()
{
$("#dbResultCheck").slideUp('fast');
$.ajax({
url: 'index.php',
data: {
'createDb': 'true',
'dbServer': $('#dbServer').val(),
'dbName': $('#dbName').val(),
'dbLogin': $('#dbLogin').val(),
'dbPassword': $('#dbPassword').val()
},
dataType: 'json',
cache: false,
success: function(json)
{
$("#dbResultCheck")
.addClass((json.success) ? 'okBlock' : 'errorBlock')
.removeClass((json.success) ? 'errorBlock' : 'okBlock')
.html(json.message)
.slideDown('slow');
},
error: function(xhr)
{
$("#dbResultCheck")
.addClass('errorBlock')
.removeClass('okBlock')
.html('An error occurred:<br /><br />' + xhr.responseText)
.slideDown('slow');
}
});
});
}