From eabff07f08f5b37c4676eb109c588231ad66c72b Mon Sep 17 00:00:00 2001
From: Frankie B <git@diskfloppy.me>
Date: Sat, 29 Jul 2023 17:15:39 +0100
Subject: [PATCH] Partial fixes
---
app/Http/Controllers/GuestbookController.php | 19 ++-
config/app.php | 157 -------------------
config/broadcasting.php | 27 ----
config/database.php | 39 -----
config/hashing.php | 37 +----
config/logging.php | 38 -----
database/factories/UserFactory.php | 38 -----
public/css/minimal.css | 2 +-
8 files changed, 13 insertions(+), 344 deletions(-)
delete mode 100644 database/factories/UserFactory.php
diff --git a/app/Http/Controllers/GuestbookController.php b/app/Http/Controllers/GuestbookController.php
index c7aa88e..4a82a61 100644
--- a/app/Http/Controllers/GuestbookController.php
+++ b/app/Http/Controllers/GuestbookController.php
@@ -18,17 +18,20 @@ public function guestbookPost(Request $request) {
$matching_bans = DB::select('SELECT reason FROM guestbook__bans WHERE ip_address = ?', array($request->ip()));
- if (count($matching_bans) > 0 ) {
+ if (!empty($matching_bans)) {
return view('errors.guestbook-ipban')->with('reason', $matching_bans[0]->reason);
}
- DB::insert('INSERT INTO guestbook__entries (name, timestamp, ip_address, agent, message) values (?, ?, ?, ?, ?)', array(
- htmlspecialchars($request->get('name')),
- time(),
- $request->ip(),
- $request->userAgent(),
- htmlspecialchars($request->get('message'))
- ));
+ DB::insert(
+ 'INSERT INTO guestbook__entries (name, timestamp, ip_address, agent, message) values (?, ?, ?, ?, ?)',
+ array(
+ htmlspecialchars($request->get('name')),
+ time(),
+ $request->ip(),
+ $request->userAgent(),
+ htmlspecialchars($request->get('message'))
+ )
+ );
return back()->with('success', 'Entry submitted successfully!');
}
diff --git a/config/app.php b/config/app.php
index 1ad039a..87399c6 100644
--- a/config/app.php
+++ b/config/app.php
@@ -4,187 +4,30 @@
use Illuminate\Support\ServiceProvider;
return [
-
- /*
- |--------------------------------------------------------------------------
- | Application Name
- |--------------------------------------------------------------------------
- |
- | This value is the name of your application. This value is used when the
- | framework needs to place the application's name in a notification or
- | any other location as required by the application or its packages.
- |
- */
-
'name' => env('APP_NAME', 'diskfloppy.me'),
'version' => '5.5.0',
-
- /*
- |--------------------------------------------------------------------------
- | Application Environment
- |--------------------------------------------------------------------------
- |
- | This value determines the "environment" your application is currently
- | running in. This may determine how you prefer to configure various
- | services the application utilizes. Set this in your ".env" file.
- |
- */
-
'env' => env('APP_ENV', 'production'),
-
- /*
- |--------------------------------------------------------------------------
- | Application Debug Mode
- |--------------------------------------------------------------------------
- |
- | When your application is in debug mode, detailed error messages with
- | stack traces will be shown on every error that occurs within your
- | application. If disabled, a simple generic error page is shown.
- |
- */
-
'debug' => (bool) env('APP_DEBUG', false),
-
- /*
- |--------------------------------------------------------------------------
- | Application URL
- |--------------------------------------------------------------------------
- |
- | This URL is used by the console to properly generate URLs when using
- | the Artisan command line tool. You should set this to the root of
- | your application so that it is used when running Artisan tasks.
- |
- */
-
'url' => env('APP_URL', 'http://localhost'),
'api_root' => env('API_ROOT', 'http://localhost:3000'),
'asset_url' => env('ASSET_URL'),
-
- /*
- |--------------------------------------------------------------------------
- | Application Timezone
- |--------------------------------------------------------------------------
- |
- | Here you may specify the default timezone for your application, which
- | will be used by the PHP date and date-time functions. We have gone
- | ahead and set this to a sensible default for you out of the box.
- |
- */
-
'timezone' => 'UTC',
-
- /*
- |--------------------------------------------------------------------------
- | Application Locale Configuration
- |--------------------------------------------------------------------------
- |
- | The application locale determines the default locale that will be used
- | by the translation service provider. You are free to set this value
- | to any of the locales which will be supported by the application.
- |
- */
-
'locale' => 'en',
-
- /*
- |--------------------------------------------------------------------------
- | Application Fallback Locale
- |--------------------------------------------------------------------------
- |
- | The fallback locale determines the locale to use when the current one
- | is not available. You may change the value to correspond to any of
- | the language folders that are provided through your application.
- |
- */
-
'fallback_locale' => 'en',
-
- /*
- |--------------------------------------------------------------------------
- | Faker Locale
- |--------------------------------------------------------------------------
- |
- | This locale will be used by the Faker PHP library when generating fake
- | data for your database seeds. For example, this will be used to get
- | localized telephone numbers, street address information and more.
- |
- */
-
'faker_locale' => 'en_US',
-
- /*
- |--------------------------------------------------------------------------
- | Encryption Key
- |--------------------------------------------------------------------------
- |
- | This key is used by the Illuminate encrypter service and should be set
- | to a random, 32 character string, otherwise these encrypted strings
- | will not be safe. Please do this before deploying an application!
- |
- */
-
'key' => env('APP_KEY'),
-
'cipher' => 'AES-256-CBC',
-
- /*
- |--------------------------------------------------------------------------
- | Maintenance Mode Driver
- |--------------------------------------------------------------------------
- |
- | These configuration options determine the driver used to determine and
- | manage Laravel's "maintenance mode" status. The "cache" driver will
- | allow maintenance mode to be controlled across multiple machines.
- |
- | Supported drivers: "file", "cache"
- |
- */
-
'maintenance' => [
'driver' => 'file',
- // 'store' => 'redis',
],
-
- /*
- |--------------------------------------------------------------------------
- | Autoloaded Service Providers
- |--------------------------------------------------------------------------
- |
- | The service providers listed here will be automatically loaded on the
- | request to your application. Feel free to add your own services to
- | this array to grant expanded functionality to your applications.
- |
- */
-
'providers' => ServiceProvider::defaultProviders()->merge([
- /*
- * Package Service Providers...
- */
-
- /*
- * Application Service Providers...
- */
App\Providers\AppServiceProvider::class,
App\Providers\AuthServiceProvider::class,
- // App\Providers\BroadcastServiceProvider::class,
App\Providers\EventServiceProvider::class,
App\Providers\RouteServiceProvider::class,
])->toArray(),
-
- /*
- |--------------------------------------------------------------------------
- | Class Aliases
- |--------------------------------------------------------------------------
- |
- | This array of class aliases will be registered when this application
- | is started. However, feel free to register as many as you wish as
- | the aliases are "lazy" loaded so they don't hinder performance.
- |
- */
-
'aliases' => Facade::defaultAliases()->merge([
// 'Example' => App\Facades\Example::class,
])->toArray(),
-
];
diff --git a/config/broadcasting.php b/config/broadcasting.php
index 2410485..98a0093 100644
--- a/config/broadcasting.php
+++ b/config/broadcasting.php
@@ -1,35 +1,8 @@
<?php
return [
-
- /*
- |--------------------------------------------------------------------------
- | Default Broadcaster
- |--------------------------------------------------------------------------
- |
- | This option controls the default broadcaster that will be used by the
- | framework when an event needs to be broadcast. You may set this to
- | any of the connections defined in the "connections" array below.
- |
- | Supported: "pusher", "ably", "redis", "log", "null"
- |
- */
-
'default' => env('BROADCAST_DRIVER', 'null'),
-
- /*
- |--------------------------------------------------------------------------
- | Broadcast Connections
- |--------------------------------------------------------------------------
- |
- | Here you may define all of the broadcast connections that will be used
- | to broadcast events to other systems or over websockets. Samples of
- | each available type of connection are provided inside this array.
- |
- */
-
'connections' => [
-
'pusher' => [
'driver' => 'pusher',
'key' => env('PUSHER_APP_KEY'),
diff --git a/config/database.php b/config/database.php
index 67ae798..5e2b5d4 100644
--- a/config/database.php
+++ b/config/database.php
@@ -3,36 +3,8 @@
use Illuminate\Support\Str;
return [
-
- /*
- |--------------------------------------------------------------------------
- | Default Database Connection Name
- |--------------------------------------------------------------------------
- |
- | Here you may specify which of the database connections below you wish
- | to use as your default connection for all database work. Of course
- | you may use many connections at once using the Database library.
- |
- */
-
'default' => env('DB_CONNECTION', 'mysql'),
- /*
- |--------------------------------------------------------------------------
- | Database Connections
- |--------------------------------------------------------------------------
- |
- | Here are each of the database connections setup for your application.
- | Of course, examples of configuring each database platform that is
- | supported by Laravel is shown below to make development simple.
- |
- |
- | All database work in Laravel is done through the PHP PDO facilities
- | so make sure you have the driver for your particular database of
- | choice installed on your machine before you begin development.
- |
- */
-
'connections' => [
'mysql' => [
'driver' => 'mysql',
@@ -55,16 +27,5 @@
],
],
- /*
- |--------------------------------------------------------------------------
- | Migration Repository Table
- |--------------------------------------------------------------------------
- |
- | This table keeps track of all the migrations that have already run for
- | your application. Using this information, we can determine which of
- | the migrations on disk haven't actually been run in the database.
- |
- */
-
'migrations' => 'migrations',
];
diff --git a/config/hashing.php b/config/hashing.php
index bcd3be4..eca4888 100644
--- a/config/hashing.php
+++ b/config/hashing.php
@@ -1,52 +1,17 @@
<?php
return [
-
- /*
- |--------------------------------------------------------------------------
- | Default Hash Driver
- |--------------------------------------------------------------------------
- |
- | This option controls the default hash driver that will be used to hash
- | passwords for your application. By default, the bcrypt algorithm is
- | used; however, you remain free to modify this option if you wish.
- |
- | Supported: "bcrypt", "argon", "argon2id"
- |
- */
-
+ // One of "bcrypt", "argon", "argon2id"
'driver' => 'bcrypt',
- /*
- |--------------------------------------------------------------------------
- | Bcrypt Options
- |--------------------------------------------------------------------------
- |
- | Here you may specify the configuration options that should be used when
- | passwords are hashed using the Bcrypt algorithm. This will allow you
- | to control the amount of time it takes to hash the given password.
- |
- */
-
'bcrypt' => [
'rounds' => env('BCRYPT_ROUNDS', 10),
],
- /*
- |--------------------------------------------------------------------------
- | Argon Options
- |--------------------------------------------------------------------------
- |
- | Here you may specify the configuration options that should be used when
- | passwords are hashed using the Argon algorithm. These will allow you
- | to control the amount of time it takes to hash the given password.
- |
- */
'argon' => [
'memory' => 65536,
'threads' => 1,
'time' => 4,
],
-
];
diff --git a/config/logging.php b/config/logging.php
index c44d276..2da9712 100644
--- a/config/logging.php
+++ b/config/logging.php
@@ -6,51 +6,13 @@
use Monolog\Processor\PsrLogMessageProcessor;
return [
-
- /*
- |--------------------------------------------------------------------------
- | Default Log Channel
- |--------------------------------------------------------------------------
- |
- | This option defines the default log channel that gets used when writing
- | messages to the logs. The name specified in this option should match
- | one of the channels defined in the "channels" configuration array.
- |
- */
-
'default' => env('LOG_CHANNEL', 'stack'),
- /*
- |--------------------------------------------------------------------------
- | Deprecations Log Channel
- |--------------------------------------------------------------------------
- |
- | This option controls the log channel that should be used to log warnings
- | regarding deprecated PHP and library features. This allows you to get
- | your application ready for upcoming major versions of dependencies.
- |
- */
-
'deprecations' => [
'channel' => env('LOG_DEPRECATIONS_CHANNEL', 'null'),
'trace' => false,
],
- /*
- |--------------------------------------------------------------------------
- | Log Channels
- |--------------------------------------------------------------------------
- |
- | Here you may configure the log channels for your application. Out of
- | the box, Laravel uses the Monolog PHP logging library. This gives
- | you a variety of powerful log handlers / formatters to utilize.
- |
- | Available Drivers: "single", "daily", "slack", "syslog",
- | "errorlog", "monolog",
- | "custom", "stack"
- |
- */
-
'channels' => [
'stack' => [
'driver' => 'stack',
diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
deleted file mode 100644
index a6ecc0a..0000000
--- a/database/factories/UserFactory.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-namespace Database\Factories;
-
-use Illuminate\Database\Eloquent\Factories\Factory;
-use Illuminate\Support\Str;
-
-/**
- * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\User>
- */
-class UserFactory extends Factory
-{
- /**
- * Define the model's default state.
- *
- * @return array<string, mixed>
- */
- public function definition(): array
- {
- return [
- 'name' => fake()->name(),
- 'email' => fake()->unique()->safeEmail(),
- 'email_verified_at' => now(),
- 'password' => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', // password
- 'remember_token' => Str::random(10),
- ];
- }
-
- /**
- * Indicate that the model's email address should be unverified.
- */
- public function unverified(): static
- {
- return $this->state(fn (array $attributes) => [
- 'email_verified_at' => null,
- ]);
- }
-}
diff --git a/public/css/minimal.css b/public/css/minimal.css
index d81245c..3193602 100644
--- a/public/css/minimal.css
+++ b/public/css/minimal.css
@@ -4,7 +4,7 @@ html {
body {
font-family: sans-serif;
- margin: 0px;
+ margin: 0;
margin-left: 10px;
color: #ddd;
background-color: #333;