beenull/XBackBone
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Added checks in the installer

Browse source
This commit is contained in:
Sergio Brighenti 2018-12-07 10:17:45 +01:00
parent 0d21b2b21d
commit 535fce4f8f
6 changed files with 33 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.htaccess
View file

@ -1,6 +1,8 @@
Options -Indexes
RewriteEngine On
RewriteRule ^(app|bin|bootstrap|resources|storage|vendor|logs)(/.*|)$ - [NC,F]
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule ^(.*)$ index.php [QSA,L]
<IfModule mod_rewrite.c>
RewriteEngine On
RewriteRule ^(app|bin|bootstrap|resources|storage|vendor|logs)(/.*|)$ - [NC,F]
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule ^(.*)$ index.php [QSA,L]
</IfModule>

5
app/Controllers/DashboardController.php
View file

@ -128,6 +128,11 @@ class DashboardController extends Controller
public function applyTheme(Request $request, Response $response): Response
{
if (!is_writable('static/bootstrap/css/bootstrap.min.css')) {
Session::alert(lang('cannot_write_file'), 'danger');
return redirect($response, route('system'));
}
file_put_contents('static/bootstrap/css/bootstrap.min.css', file_get_contents($request->getParam('css')));
return redirect($response, 'system')
->withAddedHeader('Cache-Control', 'no-cache, no-store, must-revalidate')

13
install/index.php
View file

@ -131,8 +131,16 @@ $app->post('/', function (Request $request, Response $response) use (&$config) {
$config['db']['username'] = $request->getParam('db_user');
$config['db']['password'] = $request->getParam('db_password');
if (!is_writable($config['storage_dir'])) {
Session::alert('The storage folder is not writable (' . $config['storage_dir'] . ')', 'danger');
return redirect($response, '.');
}
file_put_contents(__DIR__ . '/../config.php', '<?php' . PHP_EOL . 'return ' . var_export($config, true) . ';');
$ret = file_put_contents(__DIR__ . '/../config.php', '<?php' . PHP_EOL . 'return ' . var_export($config, true) . ';');
if ($ret === false) {
Session::alert('The config folder is not writable (' . __DIR__ . '/../config.php' . ')', 'danger');
return redirect($response, '.');
}
}
$dsn = $config['db']['connection'] === 'sqlite' ? __DIR__ . '/../' . $config['db']['dsn'] : $config['db']['dsn'];
@ -142,7 +150,8 @@ $app->post('/', function (Request $request, Response $response) use (&$config) {
migrate($config);
} catch (PDOException $exception) {
Session::alert("Cannot connect to the database: {$exception->getMessage()} [{$exception->getCode()}]", 'danger');
return redirect($response, '.');
}
if (!$installed) {

8
install/templates/install.twig
View file

@ -19,6 +19,14 @@
</head>
<body>
<div class="container">
{% for type, message in alerts %}
<div class="alert alert-{{ type }} alert-dismissible fade show" role="alert">
{{ message }}
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
{% endfor %}
<div class="row justify-content-center">
<div class="col-md-8">
<div class="card mt-3">

1
resources/lang/en.lang.php
View file

@ -84,4 +84,5 @@ return [
'user_deleted' => 'User deleted.',
'cannot_delete' => 'You cannot delete yourself.',
'cannot_demote' => 'You cannot demote yourself.',
'cannot_write_file' => 'The destination path is not writable.',
];

1
resources/lang/it.lang.php
View file

@ -84,4 +84,5 @@ return [
'user_deleted' => 'Utente rimosso.',
'cannot_delete' => 'Non puoi eliminare te stesso.',
'cannot_demote' => 'Non puoi degradare te stesso. ',
'cannot_write_file' => 'Il percorso di destinazione non è scrivibile.',
];