Cleaning up main a bit
This commit is contained in:
@@ -101,12 +101,11 @@ func adminIDHandler(w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
|
||||
func adminMembersHandler(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Method == "GET" {
|
||||
// Redirect to client's AdminMembersPage instead of serving members.html
|
||||
w.Header().Set("Location", "/admin-members")
|
||||
w.WriteHeader(http.StatusFound)
|
||||
if r.Method != http.MethodPost {
|
||||
w.WriteHeader(http.StatusMethodNotAllowed)
|
||||
return
|
||||
} else if r.Method == "POST" {
|
||||
}
|
||||
|
||||
var year int
|
||||
var err error
|
||||
|
||||
@@ -115,23 +114,25 @@ func adminMembersHandler(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
|
||||
if y := r.FormValue("year"); y != "" {
|
||||
year, err = strconv.Atoi(y)
|
||||
year_from_form := r.FormValue("year")
|
||||
if year_from_form == "" {
|
||||
http.Error(w, "Year is required", http.StatusBadRequest)
|
||||
return
|
||||
} else {
|
||||
year, err = strconv.Atoi(year_from_form)
|
||||
if err != nil {
|
||||
http.Error(w, "Invalid year", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
file, _, err := r.FormFile("members.csv")
|
||||
if err != nil {
|
||||
if file, _, err := r.FormFile("members.csv"); err != nil {
|
||||
http.Error(w, "Failed to upload file", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
defer file.Close()
|
||||
|
||||
fileBytes, err := ioutil.ReadAll(file)
|
||||
if err != nil {
|
||||
if fileBytes, err := ioutil.ReadAll(file); err != nil {
|
||||
http.Error(w, "Failed to read file", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
@@ -144,9 +145,6 @@ func adminMembersHandler(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
w.WriteHeader(http.StatusOK)
|
||||
json.NewEncoder(w).Encode(map[string]bool{"success": true})
|
||||
} else {
|
||||
w.WriteHeader(http.StatusMethodNotAllowed)
|
||||
}
|
||||
}
|
||||
|
||||
func main() {
|
||||
|
||||
Reference in New Issue
Block a user