Fix ViewMode related bugs:

- The user will no longer lost their 'ViewMode' option after being updated in the settings.
- The console will not output errors due tot he scroll function when Mosaic mode is on.


Former-commit-id: 97aa6abdc8b864dc7a55dbf03a2e58895ea7613f [formerly ff9e6ff0898f32bd106b644b2e9002b5de45281c] [formerly 556cc12bd5ff1d91776c81f48dd1dceb8bb627b4 [formerly 51104c5ee7]]
Former-commit-id: dd63b2b818a7bd4960a7243866d6b2829f4c03a8 [formerly 45855d70eaa9a2b060d3a89cb70388040ea8e6d9]
Former-commit-id: 6e0ebf10d7fe3e2c234abc9c0ffd447cfbdd7455

assets/src/views/Files.vue

@@ -210,7 +210,7 @@ export default {
       }
     },
     scroll (event) {
-      if (this.req.kind !== 'listing' || this.$store.state.req.display === 'mosaic') return
+      if (this.req.kind !== 'listing' || this.$store.state.user.viewMode === 'mosaic') return
 
       let top = 112 - window.scrollY
 

assets/src/views/settings/User.vue

@@ -7,10 +7,21 @@
       </div>
 
       <div class="card-content">
+        <p>
+          <label for="username">{{ $t('settings.username') }}</label>
+          <input type="text" v-model="username" id="username">
+        </p>
+
+        <p>
+          <label for="password">{{ $t('settings.password') }}</label>
+          <input type="password" :placeholder="passwordPlaceholder" v-model="password" id="password">
+        </p>
+
+        <p>
+          <label for="scope">{{ $t('settings.scope') }}</label>
+          <input type="text" v-model="filesystem" id="scope">
+        </p>
 
-        <p><label for="username">{{ $t('settings.username') }}</label><input type="text" v-model="username" id="username"></p>
-        <p><label for="password">{{ $t('settings.password') }}</label><input type="password" :placeholder="passwordPlaceholder" v-model="password" id="password"></p>
-        <p><label for="scope">{{ $t('settings.scope') }}</label><input type="text" v-model="filesystem" id="scope"></p>
         <p>
           <label for="locale">{{ $t('settings.language') }}</label>
           <languages id="locale" :selected.sync="locale"></languages>
@@ -91,6 +102,7 @@ export default {
   components: { Languages },
   data: () => {
     return {
+      originalUser: null,
       id: 0,
       admin: false,
       allowNew: false,
@@ -141,6 +153,7 @@ export default {
       }
 
       getUser(user).then(user => {
+        this.originalUser = user
         this.id = user.ID
         this.admin = user.admin
         this.allowCommands = user.allowCommands
@@ -242,23 +255,21 @@ export default {
       })
     },
     parseForm () {
-      let user = {
+      let user = this.originalUser
-        ID: this.id,
+      user.username = this.username
-        username: this.username,
+      user.password = this.password
-        password: this.password,
+      user.lockPassword = this.lockPassword
-        lockPassword: this.lockPassword,
+      user.filesystem = this.filesystem
-        filesystem: this.filesystem,
+      user.admin = this.admin
-        admin: this.admin,
+      user.allowCommands = this.allowCommands
-        allowCommands: this.allowCommands,
+      user.allowNew = this.allowNew
-        allowNew: this.allowNew,
+      user.allowEdit = this.allowEdit
-        allowEdit: this.allowEdit,
+      user.allowPublish = this.allowPublish
-        allowPublish: this.allowPublish,
+      user.permissions = this.permissions
-        permissions: this.permissions,
+      user.css = this.css
-        css: this.css,
+      user.locale = this.locale
-        locale: this.locale,
+      user.commands = this.commands.split(' ')
-        commands: this.commands.split(' '),
+      user.rules = []
-        rules: []
-      }
 
       let rules = this.rules.split('\n')
 

filemanager.go

@@ -39,7 +39,7 @@ var (
 	ErrEmptyScope         = errors.New("scope is empty")
 	ErrWrongDataType      = errors.New("wrong data type")
 	ErrInvalidUpdateField = errors.New("invalid field to update")
-	ErrInvalidOption      = errors.New("Invalid option")
+	ErrInvalidOption      = errors.New("invalid option")
 )
 
 // FileManager is a file manager instance. It should be creating using the

http/auth.go

@@ -1,7 +1,6 @@
 package http
 
 import (
-	"bytes"
 	"encoding/json"
 	"fmt"
 	"net/http"
@@ -14,22 +13,23 @@ import (
 	fm "github.com/hacdias/filemanager"
 )
 
+const reCaptchaAPI = "https://www.google.com/recaptcha/api/siteverify"
+
 type cred struct {
 	Password  string `json:"password"`
 	Username  string `json:"username"`
-	Recaptcha string `json:"recaptcha"`
+	ReCaptcha string `json:"recaptcha"`
 }
 
-// recaptcha checks the recaptcha code.
+// reCaptcha checks the reCaptcha code.
-func recaptcha(secret string, response string) (bool, error) {
+func reCaptcha(secret string, response string) (bool, error) {
-	api := "https://www.google.com/recaptcha/api/siteverify"
-
 	body := url.Values{}
 	body.Set("secret", secret)
 	body.Add("response", response)
 
 	client := &http.Client{}
-	resp, err := client.Post(api, "application/x-www-form-urlencoded", bytes.NewBufferString(body.Encode()))
+
+	resp, err := client.Post(reCaptchaAPI, "application/x-www-form-urlencoded", strings.NewReader(body.Encode()))
 	if err != nil {
 		return false, err
 	}
@@ -73,7 +73,7 @@ func authHandler(c *fm.Context, w http.ResponseWriter, r *http.Request) (int, er
 
 	// If ReCaptcha is enabled, check the code.
 	if len(c.ReCaptchaSecret) > 0 {
-		ok, err := recaptcha(c.ReCaptchaSecret, cred.Recaptcha)
+		ok, err := reCaptcha(c.ReCaptchaSecret, cred.ReCaptcha)
 		if err != nil {
 			fmt.Println(err)
 			return http.StatusForbidden, err
@@ -179,6 +179,7 @@ func validateAuth(c *fm.Context, r *http.Request) (bool, *fm.User) {
 	keyFunc := func(token *jwt.Token) (interface{}, error) {
 		return c.Key, nil
 	}
+
 	var claims claims
 	token, err := request.ParseFromRequestWithClaims(r,
 		extractor{},

http/download.go

@@ -17,21 +17,13 @@ import (
 // downloadHandler creates an archive in one of the supported formats (zip, tar,
 // tar.gz or tar.bz2) and sends it to be downloaded.
 func downloadHandler(c *fm.Context, w http.ResponseWriter, r *http.Request) (int, error) {
-	query := r.URL.Query().Get("format")
-
 	// If the file isn't a directory, serve it using http.ServeFile. We display it
 	// inline if it is requested.
 	if !c.File.IsDir {
-		if r.URL.Query().Get("inline") == "true" {
+		return downloadFileHandler(c, w, r)
-			w.Header().Set("Content-Disposition", "inline")
-		} else {
-			w.Header().Set("Content-Disposition", "attachment; filename=\""+c.File.Name+"\"")
-		}
-
-		http.ServeFile(w, r, c.File.Path)
-		return 0, nil
 	}
 
+	query := r.URL.Query().Get("format")
 	files := []string{}
 	names := strings.Split(r.URL.Query().Get("files"), ",")
 
@@ -111,3 +103,14 @@ func downloadHandler(c *fm.Context, w http.ResponseWriter, r *http.Request) (int
 	_, err = io.Copy(w, file)
 	return 0, err
 }
+
+func downloadFileHandler(c *fm.Context, w http.ResponseWriter, r *http.Request) (int, error) {
+	if r.URL.Query().Get("inline") == "true" {
+		w.Header().Set("Content-Disposition", "inline")
+	} else {
+		w.Header().Set("Content-Disposition", "attachment; filename=\""+c.File.Name+"\"")
+	}
+
+	http.ServeFile(w, r, c.File.Path)
+	return 0, nil
+}

http/users.go

@@ -160,6 +160,11 @@ func usersPostHandler(c *fm.Context, w http.ResponseWriter, r *http.Request) (in
 		u.Rules = []*fm.Rule{}
 	}
 
+	// If the view mode is empty, initialize with the default one.
+	if u.ViewMode == "" {
+		u.ViewMode = c.DefaultUser.ViewMode
+	}
+
 	// Initialize commands if not initialized.
 	if u.Commands == nil {
 		u.Commands = []string{}

rice-box.go.REMOVED.git-id

@@ -1 +0,0 @@
-9536ea589ebfb34b4ccbf549776ff8b4c70d6dd6