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

Code cleanup

Browse source
This commit is contained in:
Sergio Brighenti 2018-11-13 18:47:57 +01:00
parent 5c362d7e26
commit 2df1254f44
4 changed files with 10 additions and 21 deletions

5
app/Controllers/DashboardController.php
View file

@ -54,14 +54,13 @@ class DashboardController extends Controller
foreach ($medias as $media) {
$extension = pathinfo($media->filename, PATHINFO_EXTENSION);
try {
$media->size = humanFileSize($filesystem->getSize($media->storage_path));
$mime = $filesystem->getMimetype($media->storage_path);
$size = $filesystem->getSize($media->storage_path);
} catch (FileNotFoundException $e) {
$mime = null;
}
$media->mimetype = $mime;
$media->extension = $extension;
$media->size = humanFileSize($size);
$media->mimetype = $mime;
}
return $this->view->render(

1
app/Middleware/AdminMiddleware.php
View file

@ -2,7 +2,6 @@
namespace App\Middleware;
use App\Exceptions\AuthenticationException;
use App\Exceptions\UnauthorizedException;
use App\Web\Session;
use Slim\Http\Request;

1
app/Middleware/AuthMiddleware.php
View file

@ -2,7 +2,6 @@
namespace App\Middleware;
use App\Exceptions\AuthenticationException;
use App\Web\Session;
use Slim\Http\Request;
use Slim\Http\Response;

24
install/templates/install.twig
View file

@ -51,8 +51,8 @@
<div class="form-group row">
<label for="base_url" class="col-sm-3 col-form-label">Base URL</label>
<div class="col-sm-9">
<input type="text" class="form-control" id="base_url" name="base_url"
value="{{ config.base_url }}" autocomplete="off" required>
<input type="text" class="form-control" id="base_url" name="base_url" value="{{ config.base_url }}" autocomplete="off" required>
<small>No trailing slash.</small>
</div>
</div>
<hr>
@ -69,34 +69,28 @@
<div class="form-group row">
<label for="dsn" class="col-sm-3 col-form-label">Database Source Name (DSN)</label>
<div class="col-sm-9">
<input type="text" class="form-control" id="dsn" name="dsn"
value="{{ config.db.dsn }}"
autocomplete="off" required>
<input type="text" class="form-control" id="dsn" name="dsn" value="{{ config.db.dsn }}" autocomplete="off" required>
</div>
</div>
<div class="form-group row">
<label for="db_user" class="col-sm-3 col-form-label">Database Username</label>
<div class="col-sm-9">
<input type="text" class="form-control" id="db_user" name="db_user"
autocomplete="off"
disabled>
<input type="text" class="form-control" id="db_user" name="db_user" autocomplete="off" disabled>
</div>
</div>
<div class="form-group row">
<label for="db_password" class="col-sm-3 col-form-label">Database Password</label>
<div class="col-sm-9">
<input type="password" class="form-control" id="db_password" name="db_password"
autocomplete="off" disabled>
<input type="password" class="form-control" id="db_password" name="db_password" autocomplete="off" disabled>
</div>
</div>
<hr>
<div class="form-group row">
<label for="storage_dir" class="col-sm-3 col-form-label">Storage Directory</label>
<div class="col-sm-9">
<input type="text" class="form-control" id="storage_dir" name="storage_dir"
value="{{ config.storage_dir }}" autocomplete="off" required>
<input type="text" class="form-control" id="storage_dir" name="storage_dir" value="{{ config.storage_dir }}" autocomplete="off" required>
<small>Must be a writable directory</small>
</div>
</div>
@ -104,16 +98,14 @@
<div class="form-group row">
<label for="email" class="col-sm-3 col-form-label">Admin email</label>
<div class="col-sm-9">
<input type="email" class="form-control" id="email" placeholder="email@example.com"
name="email" autocomplete="off" required>
<input type="email" class="form-control" id="email" placeholder="email@example.com" name="email" autocomplete="off" required>
</div>
</div>
<div class="form-group row">
<label for="password" class="col-sm-3 col-form-label">Admin password</label>
<div class="col-sm-9">
<input type="password" class="form-control" id="password" placeholder="Password"
name="password" autocomplete="off" required>
<input type="password" class="form-control" id="password" placeholder="Password" name="password" autocomplete="off" required>
</div>
</div>