diff --git a/app/Http/Controllers/GuestbookController.php b/app/Http/Controllers/GuestbookController.php index 4c40405..ab00a11 100644 --- a/app/Http/Controllers/GuestbookController.php +++ b/app/Http/Controllers/GuestbookController.php @@ -35,20 +35,14 @@ public function addEntry(Request $request): RedirectResponse { ->from(new Address("wah@wah.moe", "wah dot moe")) ->to(new Address("roscoe@wah.moe", "Roscoe D. Wah")) ->subject("New Guestbook Entry!") - ->category("Guestbook entry") ->html(' - + -
Name:'.htmlentities($newEntry->name).'
IP:'.$newEntry->ip.'
Agent:'.htmlentities($newEntry->agent).'
Message:'.htmlentities($newEntry->message).'
') - ->text('Name: '.htmlentities($newEntry->name). - 'IP: '.$newEntry->ip. - 'Agent: '.htmlentities($newEntry->agent). - 'Message: '.htmlentities($newEntry->message) - ); +'); MailtrapClient::initSendingEmails( apiKey: config('services.mailtrap-sdk.apiKey') diff --git a/app/Models/GuestbookEntry.php b/app/Models/GuestbookEntry.php index 96d5529..fda1c4b 100644 --- a/app/Models/GuestbookEntry.php +++ b/app/Models/GuestbookEntry.php @@ -25,7 +25,7 @@ public static function create(Request $request): GuestbookEntry { $newEntry = new GuestbookEntry; $newEntry->name = $request->get('name'); $newEntry->message = $request->get('message'); - $newEntry->ip = $request->header('X-Pandur-IP') ?: $request->ip(); + $newEntry->ip = $request->header('X-Forwarded-For') ?: $request->ip(); $newEntry->agent = $request->userAgent(); $newEntry->flagged = true; $newEntry->save();