arno/lychee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed "No way to back out during database creation #195"

Browse Source
This commit is contained in:
Tobias Reich 2014-08-07 20:23:39 +02:00
parent caa59c72c8
commit 28f8aab323
3 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
assets/js/settings.js
View File

@ -47,6 +47,18 @@ var settings = {
} }
// Creation failed
if (data.indexOf("Warning: Creation failed!")!==-1) {
buttons = [
["Retry", function() { setTimeout(settings.createConfig, 400) }],
["", function() {}]
];
modal.show("Creation Failed", "Unable to create the database. Double-check your host, username and password and ensure that the specified user has the rights to modify and add content to the database.", buttons, null, false);
return false;
}
// Could not create file // Could not create file
if (data.indexOf("Warning: Could not create file!")!==-1) { if (data.indexOf("Warning: Could not create file!")!==-1) {

10
assets/min/main.js
View File

File diff suppressed because one or more lines are too long

15
php/modules/Database.php
View File

@ -72,8 +72,13 @@ class Database extends Module {
$database = new mysqli($host, $user, $password); $database = new mysqli($host, $user, $password);
if ($database->connect_errno) return 'Warning: Connection failed!'; if ($database->connect_errno) return 'Warning: Connection failed!';
else {
# Check if user can create a database
$result = $database->query('CREATE DATABASE lychee_dbcheck');
if (!$result) return 'Warning: Creation failed!';
else $database->query('DROP DATABASE lychee_dbcheck');
# Save config.php
$config = "<?php $config = "<?php
### ###
@ -92,12 +97,10 @@ if(!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
?>"; ?>";
# Save file # Save file
if (file_put_contents(LYCHEE_CONFIG_FILE, $config)===false) return 'Warning: Could not create file!'; if (file_put_contents(LYCHEE_CONFIG_FILE, $config)===false) return 'Warning: Could not create file!';
return true; return true;
}
} }