Version 1.3.6

Former-commit-id: 28c72f8ee9f7cf548dd5f2c2cc564b31ba13ada8 [formerly cd087b92826cb418d4d17ac26a8cfeb408a54919] [formerly bf241b663bdcfc00737f5bb429ef4a669c1a6c2b [formerly 3e9c3ed912]]
Former-commit-id: 2b74d089de06c4fa5d4933e0c11ff8b1afcd2f46 [formerly 9ac185e1ea76c1beec895f6c51109fd137547e60]
Former-commit-id: a27b4e08dc726769b4731abb5865d2e908387774

assets/src/i18n/index.js

@@ -9,8 +9,39 @@ import zhTW from './zh-tw.yaml'
 
 Vue.use(VueI18n)
 
+export function detectLocale () {
+  let locale = (navigator.language || navigator.browserLangugae).toLowerCase()
+  switch (true) {
+    case /^en.*/i.test(locale):
+      locale = 'en'
+      break
+    case /^fr.*/i.test(locale):
+      locale = 'fr'
+      break
+    case /^pt.*/i.test(locale):
+      locale = 'pt'
+      break
+    case /^ja.*/i.test(locale):
+      locale = 'ja'
+      break
+    case /^zh-CN/i.test(locale):
+      locale = 'zh-cn'
+      break
+    case /^zh-TW/i.test(locale):
+      locale = 'zh-tw'
+      break
+    case /^zh.*/i.test(locale):
+      locale = 'zh-cn'
+      break
+    default:
+      locale = 'en'
+  }
+
+  return locale
+}
+
 const i18n = new VueI18n({
-  locale: 'en',
+  locale: detectLocale(),
   fallbackLocale: 'en',
   messages: {
     'en': en,

assets/src/router/index.js

@@ -54,6 +54,9 @@ const router = new Router({
           redirect: {
             path: '/settings/profile'
           },
+          meta: {
+            disableOnNoAuth: true
+          },
           children: [
             {
               path: '/settings/profile',
@@ -127,16 +130,17 @@ router.beforeEach((to, from, next) => {
     auth.loggedIn()
       .then(() => {
         if (to.matched.some(record => record.meta.requiresAdmin)) {
-          if (store.state.user.admin) {
-            next()
+          if (!store.state.user.admin) {
+            next({ path: '/403' })
             return
           }
+        }
 
-          next({
-            path: '/403'
-          })
-
-          return
+        if (to.matched.some(record => record.meta.disableOnNoAuth)) {
+          if (store.state.noAuth) {
+            next({ path: '/403' })
+            return
+          }
         }
 
         next()

assets/src/store/mutations.js

@@ -1,4 +1,4 @@
-import i18n from '@/i18n'
+import * as i18n from '@/i18n'
 import moment from 'moment'
 
 const mutations = {
@@ -27,8 +27,14 @@ const mutations = {
   setLoading: (state, value) => { state.loading = value },
   setReload: (state, value) => { state.reload = value },
   setUser: (state, value) => {
-    moment.locale(value.locale)
-    i18n.locale = value.locale
+    let locale = value.locale
+
+    if (locale === '') {
+      locale = i18n.detectLocale()
+    }
+
+    moment.locale(locale)
+    i18n.default.locale = locale
     state.user = value
   },
   setCSS: (state, value) => (state.css = value),

caddy/parser/parser.go

@@ -154,7 +154,7 @@ func Parse(c *caddy.Controller, plugin string) ([]*filemanager.FileManager, erro
 				}
 
 				u.ViewMode = c.Val()
-				if u.ViewMode != "mosaic" && u.ViewMode != "list" {
+				if u.ViewMode != filemanager.MosaicViewMode && u.ViewMode != filemanager.ListViewMode {
 					return nil, c.ArgErr()
 				}
 			case "recaptcha_key":
@@ -207,7 +207,7 @@ func Parse(c *caddy.Controller, plugin string) ([]*filemanager.FileManager, erro
 			sha := hex.EncodeToString(hasher.Sum(nil))
 			database = filepath.Join(path, sha+".db")
 
-			fmt.Println("[WARNING] A database is going to be created for your File Manager instace at " + database +
+			fmt.Println("[WARNING] A database is going to be created for your File Manager instance at " + database +
 				". It is highly recommended that you set the 'database' option to '" + sha + ".db'\n")
 		}
 

cmd/filemanager/main.go

@@ -64,7 +64,7 @@ func init() {
 	flag.BoolVar(&allowPublish, "allow-publish", true, "Default allow publish option for new users")
 	flag.BoolVar(&allowNew, "allow-new", true, "Default allow new option for new users")
 	flag.BoolVar(&noAuth, "no-auth", false, "Disables authentication")
-	flag.StringVar(&locale, "locale", "en", "Default locale for new users")
+	flag.StringVar(&locale, "locale", "", "Default locale for new users, set it empty to enable auto detect from browser")
 	flag.StringVar(&staticg, "staticgen", "", "Static Generator you want to enable")
 	flag.BoolVarP(&showVer, "version", "v", false, "Show version")
 }
@@ -81,11 +81,11 @@ func setupViper() {
 	viper.SetDefault("AllowNew", true)
 	viper.SetDefault("AllowPublish", true)
 	viper.SetDefault("StaticGen", "")
-	viper.SetDefault("Locale", "en")
+	viper.SetDefault("Locale", "")
 	viper.SetDefault("NoAuth", false)
 	viper.SetDefault("BaseURL", "")
 	viper.SetDefault("PrefixURL", "")
-	viper.SetDefault("ViewMode", "mosaic")
+	viper.SetDefault("ViewMode", filemanager.MosaicViewMode)
 	viper.SetDefault("ReCaptchaKey", "")
 	viper.SetDefault("ReCaptchaSecret", "")
 

filemanager.go

@@ -22,7 +22,13 @@ import (
 )
 
 // Version is the current File Manager version.
-const Version = "1.3.5"
+const (
+	// Version is the current File Manager version.
+	Version = "1.3.6"
+
+	ListViewMode   = "list"
+	MosaicViewMode = "mosaic"
+)
 
 var (
 	ErrExist              = errors.New("the resource already exists")
@@ -207,8 +213,8 @@ func (m *FileManager) Setup() error {
 
 	// TODO: remove this after 1.5
 	for _, user := range users {
-		if user.ViewMode != "list" && user.ViewMode != "mosaic" {
-			user.ViewMode = "list"
+		if user.ViewMode != ListViewMode && user.ViewMode != MosaicViewMode {
+			user.ViewMode = ListViewMode
 			m.Store.Users.Update(user, "ViewMode")
 		}
 	}
@@ -356,7 +362,7 @@ var DefaultUser = User{
 	Rules:         []*Rule{},
 	CSS:           "",
 	Admin:         true,
-	Locale:        "en",
+	Locale:        "",
 	Scope:         ".",
 	FileSystem:    fileutils.Dir("."),
 	ViewMode:      "mosaic",

http/http.go

@@ -25,16 +25,13 @@ func Handler(m *fm.FileManager) http.Handler {
 		if code >= 400 {
 			w.WriteHeader(code)
 
-			if err == nil {
-				txt := http.StatusText(code)
-				log.Printf("%v: %v %v\n", r.URL.Path, code, txt)
-				w.Write([]byte(txt))
-			}
+			txt := http.StatusText(code)
+			log.Printf("%v: %v %v\n", r.URL.Path, code, txt)
+			w.Write([]byte(txt + "\n"))
 		}
 
 		if err != nil {
 			log.Print(err)
-			w.Write([]byte(err.Error()))
 		}
 	})
 }
@@ -270,6 +267,7 @@ func sharePage(c *fm.Context, w http.ResponseWriter, r *http.Request) (int, erro
 
 	info, err := os.Stat(s.Path)
 	if err != nil {
+		c.Store.Share.Delete(s.Hash)
 		return ErrorToHTTP(err, false), err
 	}
 

http/users.go

@@ -182,6 +182,7 @@ func usersPostHandler(c *fm.Context, w http.ResponseWriter, r *http.Request) (in
 	}
 
 	u.Password = pw
+	u.ViewMode = fm.MosaicViewMode
 
 	// Saves the user to the database.
 	err = c.Store.Users.Save(u)

rice-box.go.REMOVED.git-id

@@ -1 +1 @@
-fb04f17b945f280665365cf87b85c4f8c936b31a
+d7bb20a2a9de9e40331b2688b8f2b0f63deef097