From 5d0d4e4034090478eb376be5ed2aa70054ad8426 Mon Sep 17 00:00:00 2001 From: "Alexander \"Arav\" Andreev" Date: Sat, 11 Mar 2023 23:34:08 +0400 Subject: [PATCH] Filter new lines. --- internal/http/handlers.go | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/internal/http/handlers.go b/internal/http/handlers.go index 2ceb8a1..5b2fd71 100644 --- a/internal/http/handlers.go +++ b/internal/http/handlers.go @@ -118,6 +118,10 @@ func (h *Handlers) Guestbook(w http.ResponseWriter, r *http.Request) { return } + for _, entry := range entries { + entry.Message = strings.ReplaceAll(entry.Message, "\\n", "\n") + } + entriesCount, _ := h.guestbookDB.Count() pageCount := int64(math.Ceil(float64(entriesCount) / float64(h.guestbookPageSize))) @@ -143,7 +147,11 @@ func (h *Handlers) GuestbookPost(w http.ResponseWriter, r *http.Request) { r.Form.Set("name", "Anonymous") } - entry, err = guestbook.NewEntry(r.FormValue("name"), r.FormValue("message"), + message := strings.ReplaceAll(r.FormValue("message"), "\r\n", "\n") + message = strings.ReplaceAll(message, "\n\r", "\n") + message = strings.ReplaceAll(message, "\r", "\n") + + entry, err = guestbook.NewEntry(r.FormValue("name"), message, r.FormValue("website"), r.FormValue("hide_website") != "") if err != nil { h.InternalError(err.Error(), "Here's your message:"+r.FormValue("message"), w) @@ -163,6 +171,9 @@ func (h *Handlers) GuestbookPost(w http.ResponseWriter, r *http.Request) { func (h *Handlers) GuestbookAdmin(w http.ResponseWriter, r *http.Request) { entriesCount, _ := h.guestbookDB.Count() entries, err := h.guestbookDB.Entries(1, entriesCount) + for _, entry := range entries { + entry.Message = strings.ReplaceAll(entry.Message, "\\n", "\n") + } if err != nil { return }