From b9dace16862f4e8c796d26cb95b1de0803627b0d Mon Sep 17 00:00:00 2001 From: Fraenkiman Date: Wed, 21 Feb 2024 18:47:22 +0100 Subject: [PATCH] Fixes #304 | inaccurate error messages - Fixes #304 | inaccurate error messages in the comment editing panel --- admin/panels/entry/admin.entry.commedit.php | 37 +++++++++++++++++++- fp-interface/lang/cs-cz/lang.admin.entry.php | 7 ++++ fp-interface/lang/da-dk/lang.admin.entry.php | 7 ++++ fp-interface/lang/de-de/lang.admin.entry.php | 7 ++++ fp-interface/lang/el-gr/lang.admin.entry.php | 7 ++++ fp-interface/lang/en-us/lang.admin.entry.php | 7 ++++ fp-interface/lang/es-es/lang.admin.entry.php | 7 ++++ fp-interface/lang/fr-fr/lang.admin.entry.php | 8 ++++- fp-interface/lang/it-it/lang.admin.entry.php | 7 ++++ fp-interface/lang/ja-jp/lang.admin.entry.php | 7 ++++ fp-interface/lang/nl-nl/lang.admin.entry.php | 7 ++++ fp-interface/lang/pt-br/lang.admin.entry.php | 7 ++++ fp-interface/lang/ru-ru/lang.admin.entry.php | 7 ++++ fp-interface/lang/sl-si/lang.admin.entry.php | 7 ++++ 14 files changed, 127 insertions(+), 2 deletions(-) diff --git a/admin/panels/entry/admin.entry.commedit.php b/admin/panels/entry/admin.entry.commedit.php index de64278..782dd2e 100644 --- a/admin/panels/entry/admin.entry.commedit.php +++ b/admin/panels/entry/admin.entry.commedit.php @@ -4,7 +4,7 @@ * * Type: * Name: - * Date: 18.01.2024 + * Date: 21.02.2024 * Purpose: Provides the option to edit comments * Input: * @@ -59,6 +59,41 @@ class admin_entry_commedit extends AdminPanelActionValidated { var $nosuchcomment = false; + function commedit_validate() { + $lerr = & $lang ['admin'] ['entry'] ['commedit'] ['error']; + $errors = array(); + + // check name + if (!$name) { + $errors ['name'] = $lerr ['name']; + } + + // check email + if ($email) { + if (!filter_var($email, FILTER_VALIDATE_EMAIL)) { + $errors ['email'] = $lerr ['email']; + } + } + + // check url + if ($url) { + if (!filter_var($url, FILTER_VALIDATE_URL)) { + $errors ['url'] = $lerr ['url']; + } + } + + // check content + if (!$content) { + $errors ['content'] = $lerr ['content']; + } + + // assign error messages to template + if ($errors) { + $smarty->assign('error', $errors); + return false; + } + } + function setup() { $this->nosuchcomment = !comment_exists($_REQUEST ['entry'], $_REQUEST ['comment']); $this->smarty->assign('entryid', $_REQUEST ['entry']); diff --git a/fp-interface/lang/cs-cz/lang.admin.entry.php b/fp-interface/lang/cs-cz/lang.admin.entry.php index c960206..2969c1b 100644 --- a/fp-interface/lang/cs-cz/lang.admin.entry.php +++ b/fp-interface/lang/cs-cz/lang.admin.entry.php @@ -106,6 +106,13 @@ $lang ['admin'] ['entry'] ['commedit'] = array( 'commentlist' => 'zpět na přehled komentářů' ); +$lang ['admin'] ['entry'] ['commedit'] ['error'] = array( + 'name' => 'Název nesmí chybět.', + 'email' => 'E-mailová adresa je nesprávná.', + 'url' => 'Webová stránka je nesprávná a musí začínat na http:// nebo https://.', + 'content' => 'Nesmí chybět komentář.' +); + $lang ['admin'] ['entry'] ['commedit'] ['msgs'] = array( 1 => 'Komentář byl upravený', -1 => 'Nastala chyba při úpravě příspěvku' diff --git a/fp-interface/lang/da-dk/lang.admin.entry.php b/fp-interface/lang/da-dk/lang.admin.entry.php index 1623c6e..8e32b34 100644 --- a/fp-interface/lang/da-dk/lang.admin.entry.php +++ b/fp-interface/lang/da-dk/lang.admin.entry.php @@ -106,6 +106,13 @@ $lang ['admin'] ['entry'] ['commedit'] = array( 'commentlist' => 'tilbage til kommentaroversigten' ); +$lang ['admin'] ['entry'] ['commedit'] ['error'] = array( + 'name' => 'Navnet må ikke mangle.', + 'email' => 'E-mailadressen er forkert.', + 'url' => 'Hjemmesiden er forkert og skal begynde med http:// eller https://.', + 'content' => 'Kommentaren må ikke mangle.' +); + $lang ['admin'] ['entry'] ['commedit'] ['msgs'] = array( 1 => 'Kommentaren blev ændret', -1 => 'Der opstod en fejl ved ændring af kommentaren' diff --git a/fp-interface/lang/de-de/lang.admin.entry.php b/fp-interface/lang/de-de/lang.admin.entry.php index a267d64..1269ce8 100644 --- a/fp-interface/lang/de-de/lang.admin.entry.php +++ b/fp-interface/lang/de-de/lang.admin.entry.php @@ -106,6 +106,13 @@ $lang ['admin'] ['entry'] ['commedit'] = array( 'commentlist' => 'zurück zur Kommentarübersicht' ); +$lang ['admin'] ['entry'] ['commedit'] ['error'] = array( + 'name' => 'Der Name darf nicht fehlen.', + 'email' => 'Die E-Mail-Adresse ist fehlerhaft.', + 'url' => 'Die Angabe der Website ist fehlerhaft und muss mit http:// oder https:// beginnen.', + 'content' => 'Der Kommentar darf nicht fehlen.' +); + $lang ['admin'] ['entry'] ['commedit'] ['msgs'] = array( 1 => 'Der Kommentar wurde geändert', -1 => 'Ein Fehler ist beim Ändern des Kommentars aufgetreten' diff --git a/fp-interface/lang/el-gr/lang.admin.entry.php b/fp-interface/lang/el-gr/lang.admin.entry.php index 1d3d8de..8fd0bff 100644 --- a/fp-interface/lang/el-gr/lang.admin.entry.php +++ b/fp-interface/lang/el-gr/lang.admin.entry.php @@ -106,6 +106,13 @@ $lang ['admin'] ['entry'] ['commedit'] = array( 'commentlist' => 'πίσω στην επισκόπηση των σχολίων' ); +$lang ['admin'] ['entry'] ['commedit'] ['error'] = array( + 'name' => 'Το όνομα δεν πρέπει να λείπει.', + 'email' => 'Η διεύθυνση ηλεκτρονικού ταχυδρομείου είναι λανθασμένη.', + 'url' => 'Η ιστοσελίδα είναι λανθασμένη και πρέπει να αρχίζει με http:// ή https://.', + 'content' => 'Το σχόλιο δεν πρέπει να λείπει.' +); + $lang ['admin'] ['entry'] ['commedit'] ['msgs'] = array( 1 => 'Το σχόλιο έχει επεξεργαστεί', -1 => 'Προέκυψε ένα σφάλμα κατά την επεξεργασία του σχολίου' diff --git a/fp-interface/lang/en-us/lang.admin.entry.php b/fp-interface/lang/en-us/lang.admin.entry.php index c71adfc..8e6e9f4 100755 --- a/fp-interface/lang/en-us/lang.admin.entry.php +++ b/fp-interface/lang/en-us/lang.admin.entry.php @@ -106,6 +106,13 @@ $lang ['admin'] ['entry'] ['commedit'] = array( 'commentlist' => 'back to the comment overview' ); +$lang ['admin'] ['entry'] ['commedit'] ['error'] = array( + 'name' => 'The name must not be missing.', + 'email' => 'The e-mail address is incorrect.', + 'url' => 'The website is incorrect and must begin with http:// or https://.', + 'content' => 'The commentary must not be missing.' +); + $lang ['admin'] ['entry'] ['commedit'] ['msgs'] = array( 1 => 'Comment has been edited', -1 => 'An error occurred while trying to edit the comment' diff --git a/fp-interface/lang/es-es/lang.admin.entry.php b/fp-interface/lang/es-es/lang.admin.entry.php index 387b1a2..8b0ea48 100644 --- a/fp-interface/lang/es-es/lang.admin.entry.php +++ b/fp-interface/lang/es-es/lang.admin.entry.php @@ -106,6 +106,13 @@ $lang ['admin'] ['entry'] ['commedit'] = array( 'commentlist' => 'volver al resumen de comentarios' ); +$lang ['admin'] ['entry'] ['commedit'] ['error'] = array( + 'name' => 'El nombre no debe faltar.', + 'email' => 'La dirección de correo electrónico es incorrecta.', + 'url' => 'El sitio web es incorrecto y debe empezar por http:// o https://.', + 'content' => 'El comentario no debe faltar.' +); + $lang ['admin'] ['entry'] ['commedit'] ['msgs'] = array( 1 => 'Comment has been edited', -1 => 'An error occurred while trying to edit the comment' diff --git a/fp-interface/lang/fr-fr/lang.admin.entry.php b/fp-interface/lang/fr-fr/lang.admin.entry.php index 9bc8682..c75dacb 100644 --- a/fp-interface/lang/fr-fr/lang.admin.entry.php +++ b/fp-interface/lang/fr-fr/lang.admin.entry.php @@ -71,7 +71,6 @@ $lang ['admin'] ['entry'] ['write'] ['msgs'] = array( ); /* comments */ - $lang ['admin'] ['entry'] ['commentlist'] = array( 'head' => 'Commentaires du billet: ', 'descr' => 'Sélectionner un commentaire à effacer', @@ -107,6 +106,13 @@ $lang ['admin'] ['entry'] ['commedit'] = array( 'commentlist' => 'retour à l\'aperçu des commentaires' ); +$lang ['admin'] ['entry'] ['commedit'] ['error'] = array( + 'name' => 'Le nom ne doit pas manquer.', + 'email' => 'L\'adresse e-mail est erronée.', + 'url' => 'L\'indication du site web est erronée et doit commencer par http:// ou https://.', + 'content' => 'Le commentaire ne doit pas manquer.' +); + $lang ['admin'] ['entry'] ['commedit'] ['msgs'] = array( 1 => 'Commentaire a été modifié', -1 => 'Une erreur est survenue pendant l\'édition du commentaire' diff --git a/fp-interface/lang/it-it/lang.admin.entry.php b/fp-interface/lang/it-it/lang.admin.entry.php index 9bde210..5776713 100644 --- a/fp-interface/lang/it-it/lang.admin.entry.php +++ b/fp-interface/lang/it-it/lang.admin.entry.php @@ -106,6 +106,13 @@ $lang ['admin'] ['entry'] ['commedit'] = array( 'commentlist' => 'Torna alla panoramica dei commenti' ); +$lang ['admin'] ['entry'] ['commedit'] ['error'] = array( + 'name' => 'Il nome non deve mancare.', + 'email' => 'L\'indirizzo e-mail non è corretto.', + 'url' => 'Il sito web non è corretto e deve iniziare con http:// o https://.', + 'content' => 'Il commento non deve mancare.' +); + $lang ['admin'] ['entry'] ['commedit'] ['msgs'] = array( 1 => 'Il commento è stato modificato', -1 => 'Si è verifcato un errore durante la modifica del commento' diff --git a/fp-interface/lang/ja-jp/lang.admin.entry.php b/fp-interface/lang/ja-jp/lang.admin.entry.php index 9b202ed..a83a29f 100644 --- a/fp-interface/lang/ja-jp/lang.admin.entry.php +++ b/fp-interface/lang/ja-jp/lang.admin.entry.php @@ -106,6 +106,13 @@ $lang ['admin'] ['entry'] ['commedit'] = array( 'commentlist' => 'コメント一覧へ戻る' ); +$lang ['admin'] ['entry'] ['commedit'] ['error'] = array( + 'name' => '名前に誤りがあってはならない。', + 'email' => 'メールアドレスが間違っている。', + 'url' => 'ウェブサイトが正しくありません。 http://またはhttps://で始まる必要があります。', + 'content' => 'コメントがない。' +); + $lang ['admin'] ['entry'] ['commedit'] ['msgs'] = array( 1 => 'コメント編集を完了しました。', -1 => 'コメント編集ができませんでした。' diff --git a/fp-interface/lang/nl-nl/lang.admin.entry.php b/fp-interface/lang/nl-nl/lang.admin.entry.php index ca16c84..1b33b7d 100644 --- a/fp-interface/lang/nl-nl/lang.admin.entry.php +++ b/fp-interface/lang/nl-nl/lang.admin.entry.php @@ -106,6 +106,13 @@ $lang ['admin'] ['entry'] ['commedit'] = array( 'commentlist' => 'Terug naar het commentaaroverzicht' ); +$lang ['admin'] ['entry'] ['commedit'] ['error'] = array( + 'name' => 'De naam mag niet ontbreken.', + 'email' => 'Het e-mailadres is onjuist.', + 'url' => 'De website is onjuist en moet beginnen met http:// of https://.', + 'content' => 'Het commentaar mag niet ontbreken.' +); + $lang ['admin'] ['entry'] ['commedit'] ['msgs'] = array( 1 => 'Commentaar is bewerkt', -1 => 'Er is een fout opgetreden tijdens het bewerken van het commentaar' diff --git a/fp-interface/lang/pt-br/lang.admin.entry.php b/fp-interface/lang/pt-br/lang.admin.entry.php index ff8f55b..4246e9b 100644 --- a/fp-interface/lang/pt-br/lang.admin.entry.php +++ b/fp-interface/lang/pt-br/lang.admin.entry.php @@ -106,6 +106,13 @@ $lang ['admin'] ['entry'] ['commedit'] = array( 'commentlist' => 'Voltar à visão geral dos comentários' ); +$lang ['admin'] ['entry'] ['commedit'] ['error'] = array( + 'name' => 'O nome não pode estar faltando.', + 'email' => 'O endereço de e-mail está incorreto.', + 'url' => 'O site está incorreto e deve começar com http:// ou https://.', + 'content' => 'O comentário não pode estar faltando.' +); + $lang ['admin'] ['entry'] ['commedit'] ['msgs'] = array( 1 => 'O comentário foi editado', -1 => 'Ocorreu um erro ao tentar editar o comentário' diff --git a/fp-interface/lang/ru-ru/lang.admin.entry.php b/fp-interface/lang/ru-ru/lang.admin.entry.php index 44a3287..5fdefc7 100644 --- a/fp-interface/lang/ru-ru/lang.admin.entry.php +++ b/fp-interface/lang/ru-ru/lang.admin.entry.php @@ -106,6 +106,13 @@ $lang ['admin'] ['entry'] ['commedit'] = array( 'commentlist' => 'Вернуться к обзору комментариев' ); +$lang ['admin'] ['entry'] ['commedit'] ['error'] = array( + 'name' => 'Имя не должно отсутствовать.', + 'email' => 'Адрес электронной почты указан неверно.', + 'url' => 'Веб-сайт неверен и должен начинаться с http:// или https://.', + 'content' => 'Комментарий не должен отсутствовать.' +); + $lang ['admin'] ['entry'] ['commedit'] ['msgs'] = array( 1 => 'Комментарий отредактирован', -1 => 'При попытке отредактировать комментарий произошла ошибка' diff --git a/fp-interface/lang/sl-si/lang.admin.entry.php b/fp-interface/lang/sl-si/lang.admin.entry.php index 2a1ab9b..8154f68 100644 --- a/fp-interface/lang/sl-si/lang.admin.entry.php +++ b/fp-interface/lang/sl-si/lang.admin.entry.php @@ -106,6 +106,13 @@ $lang ['admin'] ['entry'] ['commedit'] = array( 'commentlist' => 'Nazaj na pregled komentarjev' ); +$lang ['admin'] ['entry'] ['commedit'] ['error'] = array( + 'name' => 'Ime ne sme manjkati.', + 'email' => 'E-poštni naslov je napačen.', + 'url' => 'Spletna stran je napačna in se mora začeti s http:// ali https://.', + 'content' => 'Komentar ne sme manjkati.' +); + $lang ['admin'] ['entry'] ['commedit'] ['msgs'] = array( 1 => 'Komentar je bil urejen', -1 => 'Prišlo je do napake med poskusom urejanja komentarja'