From 4a85b4162fa2173a1f4a9e2a5fce80c404932c07 Mon Sep 17 00:00:00 2001 From: Marc Ole Bulling Date: Wed, 7 Apr 2021 22:18:55 +0200 Subject: [PATCH] Fixed crashes introduced in last commit --- src/webserver/Webserver.go | 18 ++++++++++++++---- templates/html_download.tmpl | 2 +- templates/html_download_password.tmpl | 2 +- templates/html_error.tmpl | 2 +- templates/html_forgotpw.tmpl | 2 +- templates/html_login.tmpl | 2 +- 6 files changed, 19 insertions(+), 9 deletions(-) diff --git a/src/webserver/Webserver.go b/src/webserver/Webserver.go index a4f6993..52948d3 100644 --- a/src/webserver/Webserver.go +++ b/src/webserver/Webserver.go @@ -88,19 +88,19 @@ func doLogout(w http.ResponseWriter, r *http.Request) { // Handling of /index and redirecting to globalConfig.RedirectUrl func showIndex(w http.ResponseWriter, r *http.Request) { - err := templateFolder.ExecuteTemplate(w, "index", configuration.ServerSettings.RedirectUrl) + err := templateFolder.ExecuteTemplate(w, "index", GenericView{RedirectUrl: configuration.ServerSettings.RedirectUrl}) helper.Check(err) } // Handling of /error func showError(w http.ResponseWriter, r *http.Request) { - err := templateFolder.ExecuteTemplate(w, "error", nil) + err := templateFolder.ExecuteTemplate(w, "error", GenericView{}) helper.Check(err) } // Handling of /forgotpw func forgotPassword(w http.ResponseWriter, r *http.Request) { - err := templateFolder.ExecuteTemplate(w, "forgotpw", nil) + err := templateFolder.ExecuteTemplate(w, "forgotpw", GenericView{}) helper.Check(err) } @@ -126,6 +126,7 @@ func showLogin(w http.ResponseWriter, r *http.Request) { err = templateFolder.ExecuteTemplate(w, "login", LoginView{ IsFailedLogin: failedLogin, User: user, + IsAdminView: false, }) helper.Check(err) } @@ -134,6 +135,7 @@ func showLogin(w http.ResponseWriter, r *http.Request) { type LoginView struct { IsFailedLogin bool User string + IsAdminView bool } // Handling of /d @@ -237,6 +239,7 @@ type DownloadView struct { Size string Id string IsFailedLogin bool + IsAdminView bool } // Parameters for the admin menu template @@ -248,6 +251,7 @@ type UploadView struct { DefaultDownloads int DefaultExpiry int DefaultPassword string + IsAdminView bool } // Converts the globalConfig variable to an UploadView struct to pass the infos to @@ -271,6 +275,7 @@ func (u *UploadView) convertGlobalConfig() *UploadView { u.DefaultExpiry = configuration.ServerSettings.DefaultExpiry u.DefaultDownloads = configuration.ServerSettings.DefaultDownloads u.TimeNow = time.Now().Unix() + u.IsAdminView = true return u } @@ -366,4 +371,9 @@ func isValidPwCookie(r *http.Request, file filestructure.File) bool { } } return false -} \ No newline at end of file +} + +type GenericView struct { + IsAdminView bool + RedirectUrl string +} diff --git a/templates/html_download.tmpl b/templates/html_download.tmpl index f90624d..5e9367e 100644 --- a/templates/html_download.tmpl +++ b/templates/html_download.tmpl @@ -1,5 +1,5 @@ {{define "download"}} -{{template "header"}} +{{template "header" .}}
diff --git a/templates/html_download_password.tmpl b/templates/html_download_password.tmpl index 8154815..1f4287e 100644 --- a/templates/html_download_password.tmpl +++ b/templates/html_download_password.tmpl @@ -1,5 +1,5 @@ {{define "download_password"}} -{{template "header"}} +{{template "header" .}}
diff --git a/templates/html_error.tmpl b/templates/html_error.tmpl index de8946e..8ddec09 100644 --- a/templates/html_error.tmpl +++ b/templates/html_error.tmpl @@ -1,5 +1,5 @@ {{define "error"}} -{{template "header"}} +{{template "header" .}}
diff --git a/templates/html_forgotpw.tmpl b/templates/html_forgotpw.tmpl index 1a8e21a..87d6fa3 100644 --- a/templates/html_forgotpw.tmpl +++ b/templates/html_forgotpw.tmpl @@ -1,5 +1,5 @@ {{define "forgotpw"}} -{{ template "header" }} +{{ template "header" . }}
diff --git a/templates/html_login.tmpl b/templates/html_login.tmpl index 4eb0cc8..d265fc0 100644 --- a/templates/html_login.tmpl +++ b/templates/html_login.tmpl @@ -1,5 +1,5 @@ {{define "login"}} -{{ template "header" }} +{{ template "header" . }}