Browse Source

Code cleanup

Sergio Brighenti 6 years ago
parent
commit
2df1254f44

+ 2 - 3
app/Controllers/DashboardController.php

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

+ 0 - 1
app/Middleware/AdminMiddleware.php

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

+ 0 - 1
app/Middleware/AuthMiddleware.php

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

+ 8 - 16
install/templates/install.twig

@@ -51,8 +51,8 @@
                             <div class="form-group row">
                             <div class="form-group row">
                                 <label for="base_url" class="col-sm-3 col-form-label">Base URL</label>
                                 <label for="base_url" class="col-sm-3 col-form-label">Base URL</label>
                                 <div class="col-sm-9">
                                 <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>
                             </div>
                             </div>
                             <hr>
                             <hr>
@@ -69,34 +69,28 @@
                             <div class="form-group row">
                             <div class="form-group row">
                                 <label for="dsn" class="col-sm-3 col-form-label">Database Source Name (DSN)</label>
                                 <label for="dsn" class="col-sm-3 col-form-label">Database Source Name (DSN)</label>
                                 <div class="col-sm-9">
                                 <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>
                             </div>
 
 
                             <div class="form-group row">
                             <div class="form-group row">
                                 <label for="db_user" class="col-sm-3 col-form-label">Database Username</label>
                                 <label for="db_user" class="col-sm-3 col-form-label">Database Username</label>
                                 <div class="col-sm-9">
                                 <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>
                             </div>
 
 
                             <div class="form-group row">
                             <div class="form-group row">
                                 <label for="db_password" class="col-sm-3 col-form-label">Database Password</label>
                                 <label for="db_password" class="col-sm-3 col-form-label">Database Password</label>
                                 <div class="col-sm-9">
                                 <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>
                             </div>
                             </div>
                             <hr>
                             <hr>
                             <div class="form-group row">
                             <div class="form-group row">
                                 <label for="storage_dir" class="col-sm-3 col-form-label">Storage Directory</label>
                                 <label for="storage_dir" class="col-sm-3 col-form-label">Storage Directory</label>
                                 <div class="col-sm-9">
                                 <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>
                                     <small>Must be a writable directory</small>
                                 </div>
                                 </div>
                             </div>
                             </div>
@@ -104,16 +98,14 @@
                             <div class="form-group row">
                             <div class="form-group row">
                                 <label for="email" class="col-sm-3 col-form-label">Admin email</label>
                                 <label for="email" class="col-sm-3 col-form-label">Admin email</label>
                                 <div class="col-sm-9">
                                 <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>
                             </div>
 
 
                             <div class="form-group row">
                             <div class="form-group row">
                                 <label for="password" class="col-sm-3 col-form-label">Admin password</label>
                                 <label for="password" class="col-sm-3 col-form-label">Admin password</label>
                                 <div class="col-sm-9">
                                 <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>
                             </div>
                             </div>