mirror of
				https://github.com/osmarks/mycorrhiza.git
				synced 2025-10-31 15:43:00 +00:00 
			
		
		
		
	Merge pull request #37 from hugmouse/Empty-page-handling
Sending a 404 status if there is no content on the page
This commit is contained in:
		| @@ -112,10 +112,19 @@ func handlerHypha(w http.ResponseWriter, rq *http.Request) { | ||||
| 			contents = views.AttachmentHTML(h) + contents | ||||
| 		} | ||||
| 	} | ||||
| 	util.HTTP200Page(w, | ||||
| 		views.BaseHTML( | ||||
| 			util.BeautifulName(hyphaName), | ||||
| 			views.HyphaHTML(rq, h, contents), | ||||
| 			u, | ||||
| 			openGraph)) | ||||
| 	if contents == "" { | ||||
| 		util.HTTP404Page(w, | ||||
| 			views.BaseHTML( | ||||
| 				util.BeautifulName(hyphaName), | ||||
| 				views.HyphaHTML(rq, h, contents), | ||||
| 				u, | ||||
| 				openGraph)) | ||||
| 	} else { | ||||
| 		util.HTTP200Page(w, | ||||
| 			views.BaseHTML( | ||||
| 				util.BeautifulName(hyphaName), | ||||
| 				views.HyphaHTML(rq, h, contents), | ||||
| 				u, | ||||
| 				openGraph)) | ||||
| 	} | ||||
| } | ||||
|   | ||||
| @@ -53,6 +53,13 @@ func ShorterPath(path string) string { | ||||
| 	return path | ||||
| } | ||||
|  | ||||
| // HTTP404Page writes a 404 error in the status, needed when no content is found on the page. | ||||
| func HTTP404Page(w http.ResponseWriter, page string) { | ||||
| 	w.Header().Set("Content-Type", "text/html;charset=utf-8") | ||||
| 	w.WriteHeader(http.StatusNotFound) | ||||
| 	w.Write([]byte(page)) | ||||
| } | ||||
|  | ||||
| // HTTP200Page wraps some frequently used things for successful 200 responses. | ||||
| func HTTP200Page(w http.ResponseWriter, page string) { | ||||
| 	w.Header().Set("Content-Type", "text/html;charset=utf-8") | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Timur Ismagilov
					Timur Ismagilov