From 8598db2accccf5b87353e5e718b2ad1c946e5c44 Mon Sep 17 00:00:00 2001 From: Marcel Szalbach <4-bar-killa@web.de> Date: Fri, 6 Mar 2026 15:32:04 +0100 Subject: [PATCH] =?UTF-8?q?fix:=20added=20dateFormat=20to=20getUserDefault?= =?UTF-8?q?s=20so=20this=20is=20respected=20in=20the=20=E2=80=A6=20(#5804)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- auth/hook.go | 2 ++ cmd/config.go | 3 ++- cmd/users.go | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/auth/hook.go b/auth/hook.go index 0c5efac5..2541b684 100644 --- a/auth/hook.go +++ b/auth/hook.go @@ -168,6 +168,7 @@ func (a *HookAuth) SaveUser() (*users.User, error) { Sorting: a.Settings.Defaults.Sorting, Perm: a.Settings.Defaults.Perm, Commands: a.Settings.Defaults.Commands, + DateFormat: a.Settings.Defaults.DateFormat, HideDotfiles: a.Settings.Defaults.HideDotfiles, } u = a.GetUser(d) @@ -233,6 +234,7 @@ func (a *HookAuth) GetUser(d *users.User) *users.User { By: a.Fields.GetString("user.sorting.by", d.Sorting.By), }, Commands: a.Fields.GetArray("user.commands", d.Commands), + DateFormat: a.Fields.GetBoolean("user.dateFormat", d.DateFormat), HideDotfiles: a.Fields.GetBoolean("user.hideDotfiles", d.HideDotfiles), Perm: perms, LockPassword: true, diff --git a/cmd/config.go b/cmd/config.go index 5b3314ed..e3bb2b86 100644 --- a/cmd/config.go +++ b/cmd/config.go @@ -99,7 +99,7 @@ func getProxyAuth(flags *pflag.FlagSet, defaultAuther map[string]interface{}) (a return nil, err } - if header == "" && defaultAuther != nil { + if header == "" && defaultAuther != nil { header = defaultAuther["header"].(string) } @@ -236,6 +236,7 @@ func printSettings(ser *settings.Server, set *settings.Settings, auther auth.Aut fmt.Fprintln(w, "\nDefaults:") fmt.Fprintf(w, "\tScope:\t%s\n", set.Defaults.Scope) + fmt.Fprintf(w, "\tDateFormat:\t%t\n", set.Defaults.DateFormat) fmt.Fprintf(w, "\tHideDotfiles:\t%t\n", set.Defaults.HideDotfiles) fmt.Fprintf(w, "\tLocale:\t%s\n", set.Defaults.Locale) fmt.Fprintf(w, "\tView mode:\t%s\n", set.Defaults.ViewMode) diff --git a/cmd/users.go b/cmd/users.go index 7d35e964..7aae00a9 100644 --- a/cmd/users.go +++ b/cmd/users.go @@ -138,6 +138,8 @@ func getUserDefaults(flags *pflag.FlagSet, defaults *settings.UserDefaults, all defaults.Sorting.By, err = flags.GetString(flag.Name) case "sorting.asc": defaults.Sorting.Asc, err = flags.GetBool(flag.Name) + case "dateFormat": + defaults.DateFormat, err = flags.GetBool(flag.Name) case "hideDotfiles": defaults.HideDotfiles, err = flags.GetBool(flag.Name) }