diff --git a/src/server/config.go b/src/server/config.go index 54b9fe8..4e6cdc7 100644 --- a/src/server/config.go +++ b/src/server/config.go @@ -25,7 +25,6 @@ type Config struct { ObservationInterval int `json:"observation_internal"` Languages []string `json:"languages"` Language string `json:"language"` - UploadFileButton bool `json:"upload_file_button"` } func NewConfig() *Config { @@ -70,8 +69,7 @@ func NewConfig() *Config { "SQL", "YAML", }, - Language: "text", - UploadFileButton: true, + Language: "text", } } diff --git a/src/server/server.go b/src/server/server.go index 4c21dab..419c553 100644 --- a/src/server/server.go +++ b/src/server/server.go @@ -186,14 +186,13 @@ func (h *GetProtectedNoteHandler) ServeHTTP(w http.ResponseWriter, r *http.Reque } type PageData struct { - Title string - Version string - Expirations []int - Languages []string - Err error - URL string - Note *Note - UploadFileButton bool + Title string + Version string + Expirations []int + Languages []string + Err error + URL string + Note *Note } type HomeHandler struct { @@ -247,7 +246,7 @@ func (h *CreateNoteWithFormHandler) ServeHTTP(w http.ResponseWriter, r *http.Req } h.logger.Debug("checking file content type") - if !strings.HasPrefix(handler.Header.Get("Content-Type"), "text/") { + if handler.Header.Get("Content-Type") != "text/plain" { h.PageData.Err = fmt.Errorf("text file expected (got %s)", handler.Header.Get("Content-Type")) h.Templates.ExecuteTemplate(w, templateName, h.PageData) return @@ -378,12 +377,6 @@ func (h *GetProtectedWebNoteHandler) ServeHTTP(w http.ResponseWriter, r *http.Re return } - if note == nil { - h.PageData.Err = fmt.Errorf("Note doesn't exist or has been deleted") - h.Templates.ExecuteTemplate(w, templateName, h.PageData) - return - } - if password != "" && note.Encrypted { note.Content, err = internal.Decrypt(note.Content, password) if err != nil { @@ -433,9 +426,6 @@ func (s *Server) Start() error { if s.config.ShowVersion { p.Version = s.version } - if s.config.UploadFileButton { - p.UploadFileButton = true - } templates, err := template.New("templates").Funcs(funcs).ParseFS(templatesFS, "templates/*.html") if err != nil { diff --git a/src/server/templates/index.html b/src/server/templates/index.html index c7d47e4..42faef1 100644 --- a/src/server/templates/index.html +++ b/src/server/templates/index.html @@ -31,11 +31,9 @@ value="delete-after-read" name="delete-after-read"> - {{if .UploadFileButton}}
- {{end}}