Merge pull request #11 from ProjectSegfault/options-pub

Options pub

api/announcements.go

@@ -24,14 +24,11 @@ func AnnCheck() {
 		http.HandleFunc("/announcements", func(w http.ResponseWriter, r *http.Request) {
 			http.Error(w, "Announcements are disabled.", http.StatusServiceUnavailable)
 		})
-		http.HandleFunc("/api/set/announcements", func(w http.ResponseWriter, r *http.Request) {
+		http.HandleFunc("/api/announcements", func(w http.ResponseWriter, r *http.Request) {
-			http.Error(w, "{\"enabled\": \"false\"}", http.StatusOK)
+			http.Error(w, "{\"enabled\": \"false\"}", http.StatusServiceUnavailable)
 		})
 	} else {
 		AnnPage()
-		http.HandleFunc("/api/set/announcements", func(w http.ResponseWriter, r *http.Request) {
-			http.Error(w, "{\"enabled\": \"true\"}", http.StatusOK)
-		})
 		Announcements()
 	}
 }
@@ -64,6 +61,7 @@ func handleAnnouncements(w http.ResponseWriter, r *http.Request) {
 			w.WriteHeader(http.StatusOK)
 			now := time.Now().Unix()
 			data := map[string]interface{}{
+				"enabled":  "true",
 				"title":    r.FormValue("title"),
 				"link":     r.FormValue("link"),
 				"severity": r.FormValue("severity"),

api/form.go

@@ -27,15 +27,8 @@ func FormCheck() {
 		http.HandleFunc("/form", func(w http.ResponseWriter, r *http.Request) {
 			http.Error(w, "Form is disabled.", http.StatusServiceUnavailable)
 		})
-		http.HandleFunc("/api/set/form", func(w http.ResponseWriter, r *http.Request) {
-			http.Error(w, "{\"enabled\": \"false\"}", http.StatusOK)
-		})
-
 	} else {
 		FormPage()
-		http.HandleFunc("/api/set/form", func(w http.ResponseWriter, r *http.Request) {
-			http.Error(w, "{\"enabled\": \"true\"}", http.StatusOK)
-		})
 		Form()
 	}
 }