diff options
Diffstat (limited to 'handler.go')
| -rw-r--r-- | handler.go | 31 |
1 files changed, 16 insertions, 15 deletions
@@ -37,7 +37,7 @@ func recipeGet(w http.ResponseWriter, r *http.Request) { return } - data := struct{ + data := struct { Id string Recipe recipe }{idStr, rec} @@ -67,7 +67,7 @@ func recipeEditGet(w http.ResponseWriter, r *http.Request) { return } - recipe := struct{ + recipe := struct { Id string Title string Text string @@ -78,12 +78,17 @@ func recipeEditGet(w http.ResponseWriter, r *http.Request) { func recipeEditPost(w http.ResponseWriter, r *http.Request) { - ids := r.URL.Query()["id"] - if len(ids) != 1 { - http.Error(w, "Exactly 1 'id' URL parameter expected.", 400) - return + r.ParseForm() + + for _, v := range []string{"id", "text"} { + if len(r.Form[v]) != 1 { + http.Error(w, "Exactly 1 '"+v+"' form parameter expected.", 400) + return + } } - idStr := ids[0] + + idStr := r.Form["id"][0] + buffer := r.Form["text"][0] idRegex := regexp.MustCompile(VALID_ID_REGEX) if !(idRegex.MatchString(idStr)) { @@ -91,17 +96,13 @@ func recipeEditPost(w http.ResponseWriter, r *http.Request) { return } - buffer, err := ioutil.ReadAll(r.Body) - if err != nil { - http.Error(w, "Could not read request body.", 400) - return - } - textpath := filepath.Join(config.Data, "recipes", idStr, "text") - err = ioutil.WriteFile(textpath, buffer, 0644) + err := ioutil.WriteFile(textpath, []byte(buffer), 0644) if err != nil { http.Error(w, "Could not save new text for recipe.", 500) } + + http.Redirect(w, r, "/recipe?id="+idStr, 303) } func recipeConfirmDeletionGet(w http.ResponseWriter, r *http.Request) { @@ -112,7 +113,7 @@ func recipeConfirmDeletionGet(w http.ResponseWriter, r *http.Request) { return } - ServeTemplate(w, "recipe_confirm_deletion.html", struct{Id string}{ids[0]}) + ServeTemplate(w, "recipe_confirm_deletion.html", struct{ Id string }{ids[0]}) } func recipeConfirmDeletionPost(w http.ResponseWriter, r *http.Request) { |