Revert "use custom header for guestbook IP"

This reverts commit f58a3c9483.
This commit is contained in:
Roscoe 2026-02-24 23:50:50 +00:00
commit bf38e8b731
Signed by: RoscoeDaWah
SSH key fingerprint: SHA256:Hqn452XQ1ETzUt/FthJu6+OFkS4NBxCv5VQSEvuk7CE
2 changed files with 3 additions and 9 deletions

View file

@ -35,20 +35,14 @@ public function addEntry(Request $request): RedirectResponse {
->from(new Address("wah@wah.moe", "wah dot moe")) ->from(new Address("wah@wah.moe", "wah dot moe"))
->to(new Address("roscoe@wah.moe", "Roscoe D. Wah")) ->to(new Address("roscoe@wah.moe", "Roscoe D. Wah"))
->subject("New Guestbook Entry!") ->subject("New Guestbook Entry!")
->category("Guestbook entry")
->html(' ->html('
<style> td { padding: 5px; vertical-align: top } </style> <style> td { padding: 5px } </style>
<table border="1"> <table border="1">
<tr><td><b>Name:</b></td><td>'.htmlentities($newEntry->name).'</td></tr> <tr><td><b>Name:</b></td><td>'.htmlentities($newEntry->name).'</td></tr>
<tr><td><b>IP:</b></td><td>'.$newEntry->ip.'</td></tr> <tr><td><b>IP:</b></td><td>'.$newEntry->ip.'</td></tr>
<tr><td><b>Agent:</b></td><td>'.htmlentities($newEntry->agent).'</td></tr> <tr><td><b>Agent:</b></td><td>'.htmlentities($newEntry->agent).'</td></tr>
<tr><td><b>Message:</b></td><td>'.htmlentities($newEntry->message).'</td></tr> <tr><td><b>Message:</b></td><td>'.htmlentities($newEntry->message).'</td></tr>
</table>') </table>');
->text('Name: '.htmlentities($newEntry->name).
'IP: '.$newEntry->ip.
'Agent: '.htmlentities($newEntry->agent).
'Message: '.htmlentities($newEntry->message)
);
MailtrapClient::initSendingEmails( MailtrapClient::initSendingEmails(
apiKey: config('services.mailtrap-sdk.apiKey') apiKey: config('services.mailtrap-sdk.apiKey')

View file

@ -25,7 +25,7 @@ public static function create(Request $request): GuestbookEntry {
$newEntry = new GuestbookEntry; $newEntry = new GuestbookEntry;
$newEntry->name = $request->get('name'); $newEntry->name = $request->get('name');
$newEntry->message = $request->get('message'); $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->agent = $request->userAgent();
$newEntry->flagged = true; $newEntry->flagged = true;
$newEntry->save(); $newEntry->save();