From e1e9c9e99ba367e506bb17367ddab62547deb360 Mon Sep 17 00:00:00 2001 From: William Date: Sun, 22 Jan 2023 18:18:12 +0100 Subject: [PATCH] Commit --- public/static/img/fart.png | Bin 5183 -> 0 bytes routes/willychat.php | 45 ++++++++++++++++------------- views/pages/willychat/error.php | 33 --------------------- views/pages/willychat/index.php | 11 +++++-- views/pages/willychat/messages.php | 2 +- 5 files changed, 34 insertions(+), 57 deletions(-) delete mode 100644 public/static/img/fart.png delete mode 100644 views/pages/willychat/error.php diff --git a/public/static/img/fart.png b/public/static/img/fart.png deleted file mode 100644 index eba7dfe19b5a0f6546191ceef1460d9e7416bbc4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5183 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 diff --git a/routes/willychat.php b/routes/willychat.php index 993904d..add9be4 100644 --- a/routes/willychat.php +++ b/routes/willychat.php @@ -27,34 +27,39 @@ Route::match('get|post','/willychat/', function() { $default_nick = 'Willy'; $nick = $default_nick; $just_sent_message = false; + $errmsg = false; if (!empty($_POST)) { $nick = filter_input(INPUT_POST, 'nick'); $text = filter_input(INPUT_POST, 'text'); - if (empty(trim($nick, ' '))) { - $nick = $default_nick; - } + $errmsg = (function() use (&$text, &$nick): string|false { - if (strlen($nick) > 128) { - view('pages/willychat/error', [ - 'error' => 'Your nickname is too long.' - ]); - die(); - } + if (empty(trim($nick, ' '))) { + return 'You must choose a nickname.'; + } - if (strlen($text) > 4096) { - view('pages/willychat/error', [ - 'error' => 'Do not send EXTREMELY long messages.' - ]); - die(); - } + $nick_max_chars = 128; + if (strlen($nick) > $nick_max_chars) { + return 'Your nickname is too long.'; + } - if (count(WillyChat::$messages) > 10) { - array_pop(WillyChat::$messages); - } + $text_max_chars = 4096; + if (strlen($text) > $text_max_chars) { + return 'Your message is too long. ' . strlen($text) . ' out of ' . $text_max_chars . ' characters.'; + } - if (!empty(trim($text, ' '))) { + if (empty(trim($text, ' '))) { + return 'Message body cannot be empty.'; + } + + return false; + })(); + + if (!$errmsg) { + if (count(WillyChat::$messages) > 10) { + array_pop(WillyChat::$messages); + } array_unshift(WillyChat::$messages, [ 'nick' => $nick, @@ -68,13 +73,13 @@ Route::match('get|post','/willychat/', function() { ) ); } - $just_sent_message = true; } view('pages/willychat/index', [ 'nick' => $nick, 'just_sent_message' => $just_sent_message, + 'errmsg' => $errmsg ]); }); diff --git a/views/pages/willychat/error.php b/views/pages/willychat/error.php deleted file mode 100644 index 43f9e84..0000000 --- a/views/pages/willychat/error.php +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - What are you doing? - - - - - -
- -

- - I understand. - -
- - - \ No newline at end of file diff --git a/views/pages/willychat/index.php b/views/pages/willychat/index.php index b6f5952..4807742 100644 --- a/views/pages/willychat/index.php +++ b/views/pages/willychat/index.php @@ -37,6 +37,7 @@ padding-left: 0; padding-right: 0; border: 0; + text-indent: .5rem; } table { border-collapse: collapse; @@ -44,7 +45,7 @@ width: 100%; } td { - border: 1px solid #aaa; + border: 1px solid silver; } @@ -52,16 +53,20 @@
- + - +
+ +

Error:

+ +
diff --git a/views/pages/willychat/messages.php b/views/pages/willychat/messages.php index f199986..6d1fed1 100644 --- a/views/pages/willychat/messages.php +++ b/views/pages/willychat/messages.php @@ -27,7 +27,7 @@
- says: +