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.

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.
-func recaptcha(secret string, response string) (bool, error) {
-	api := "https://www.google.com/recaptcha/api/siteverify"
-
+// reCaptcha checks the reCaptcha code.
+func reCaptcha(secret string, response string) (bool, error) {
 	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" {
-			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
+		return downloadFileHandler(c, w, r)
 	}
 
+	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{}