|
@@ -237,20 +237,20 @@ func system_fs_handleFileSearch(w http.ResponseWriter, r *http.Request) {
|
|
|
}
|
|
|
|
|
|
//Get the search target root path
|
|
|
- vpath, err := utils.Mv(r, "path", true)
|
|
|
+ vpath, err := utils.PostPara(r, "path")
|
|
|
if err != nil {
|
|
|
utils.SendErrorResponse(w, "Invalid vpath given")
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- keyword, err := utils.Mv(r, "keyword", true)
|
|
|
+ keyword, err := utils.PostPara(r, "keyword")
|
|
|
if err != nil {
|
|
|
utils.SendErrorResponse(w, "Invalid keyword given")
|
|
|
return
|
|
|
}
|
|
|
|
|
|
//Check if case sensitive is enabled
|
|
|
- casesensitve, _ := utils.Mv(r, "casesensitive", true)
|
|
|
+ casesensitve, _ := utils.PostPara(r, "casesensitive")
|
|
|
|
|
|
vrootID, _, err := filesystem.GetIDFromVirtualPath(vpath)
|
|
|
var targetFSH *filesystem.FileSystemHandler = nil
|
|
@@ -369,7 +369,7 @@ func system_fs_handleLowMemoryUpload(w http.ResponseWriter, r *http.Request) {
|
|
|
}
|
|
|
|
|
|
//Get filename and upload path
|
|
|
- filename, err := utils.Mv(r, "filename", false)
|
|
|
+ filename, err := utils.GetPara(r, "filename")
|
|
|
if filename == "" || err != nil {
|
|
|
w.WriteHeader(http.StatusInternalServerError)
|
|
|
w.Write([]byte("500 - Invalid filename given"))
|
|
@@ -377,7 +377,7 @@ func system_fs_handleLowMemoryUpload(w http.ResponseWriter, r *http.Request) {
|
|
|
}
|
|
|
|
|
|
//Get upload target directory
|
|
|
- uploadTarget, err := utils.Mv(r, "path", false)
|
|
|
+ uploadTarget, err := utils.GetPara(r, "path")
|
|
|
if uploadTarget == "" || err != nil {
|
|
|
w.WriteHeader(http.StatusInternalServerError)
|
|
|
w.Write([]byte("500 - Invalid path given"))
|
|
@@ -416,7 +416,7 @@ func system_fs_handleLowMemoryUpload(w http.ResponseWriter, r *http.Request) {
|
|
|
|
|
|
//Check if it is huge file upload mode
|
|
|
isHugeFile := false
|
|
|
- hugefile, _ := utils.Mv(r, "hugefile", false)
|
|
|
+ hugefile, _ := utils.GetPara(r, "hugefile")
|
|
|
if hugefile == "true" && !fsh.RequireBuffer {
|
|
|
//Huge file mode is only compatible with local file systems
|
|
|
//For remote file system, use buffer to tmp then upload method
|
|
@@ -754,7 +754,7 @@ func system_fs_handleUpload(w http.ResponseWriter, r *http.Request) {
|
|
|
}
|
|
|
|
|
|
//Get upload target directory
|
|
|
- uploadTarget, _ := utils.Mv(r, "path", true)
|
|
|
+ uploadTarget, _ := utils.PostPara(r, "path")
|
|
|
if uploadTarget == "" {
|
|
|
utils.SendErrorResponse(w, "Upload target cannot be empty.")
|
|
|
return
|
|
@@ -874,8 +874,8 @@ func system_fs_validateFileOpr(w http.ResponseWriter, r *http.Request) {
|
|
|
utils.SendErrorResponse(w, err.Error())
|
|
|
return
|
|
|
}
|
|
|
- vsrcFiles, _ := utils.Mv(r, "src", true)
|
|
|
- vdestFile, _ := utils.Mv(r, "dest", true)
|
|
|
+ vsrcFiles, _ := utils.PostPara(r, "src")
|
|
|
+ vdestFile, _ := utils.PostPara(r, "dest")
|
|
|
var duplicateFiles []string = []string{}
|
|
|
|
|
|
//Loop through all files are see if there are duplication during copy and paste
|
|
@@ -1061,7 +1061,7 @@ func system_fs_restoreFile(w http.ResponseWriter, r *http.Request) {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- targetTrashedFile, err := utils.Mv(r, "src", true)
|
|
|
+ targetTrashedFile, err := utils.PostPara(r, "src")
|
|
|
if err != nil {
|
|
|
utils.SendErrorResponse(w, "Invalid src given")
|
|
|
return
|
|
@@ -1197,9 +1197,9 @@ func system_fs_handleNewObjects(w http.ResponseWriter, r *http.Request) {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- fileType, _ := utils.Mv(r, "type", true) //File creation type, {file, folder}
|
|
|
- vsrc, _ := utils.Mv(r, "src", true) //Virtual file source folder, do not include filename
|
|
|
- filename, _ := utils.Mv(r, "filename", true) //Filename for the new file
|
|
|
+ fileType, _ := utils.PostPara(r, "type") //File creation type, {file, folder}
|
|
|
+ vsrc, _ := utils.PostPara(r, "src") //Virtual file source folder, do not include filename
|
|
|
+ filename, _ := utils.PostPara(r, "filename") //Filename for the new file
|
|
|
|
|
|
if fileType == "" && filename == "" {
|
|
|
//List all the supported new filetype
|
|
@@ -1321,10 +1321,10 @@ func system_fs_handleWebSocketOpr(w http.ResponseWriter, r *http.Request) {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- operation, _ := utils.Mv(r, "opr", false) //Accept copy and move
|
|
|
- vsrcFiles, _ := utils.Mv(r, "src", false)
|
|
|
- vdestFile, _ := utils.Mv(r, "dest", false)
|
|
|
- existsOpr, _ := utils.Mv(r, "existsresp", false)
|
|
|
+ operation, _ := utils.GetPara(r, "opr") //Accept copy and move
|
|
|
+ vsrcFiles, _ := utils.GetPara(r, "src")
|
|
|
+ vdestFile, _ := utils.GetPara(r, "dest")
|
|
|
+ existsOpr, _ := utils.GetPara(r, "existsresp")
|
|
|
|
|
|
if existsOpr == "" {
|
|
|
existsOpr = "keep"
|
|
@@ -1697,10 +1697,10 @@ func system_fs_handleOpr(w http.ResponseWriter, r *http.Request) {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- operation, _ := utils.Mv(r, "opr", true)
|
|
|
- vsrcFiles, _ := utils.Mv(r, "src", true)
|
|
|
- vdestFile, _ := utils.Mv(r, "dest", true)
|
|
|
- vnfilenames, _ := utils.Mv(r, "new", true) //Only use when rename or create new file / folder
|
|
|
+ operation, _ := utils.PostPara(r, "opr")
|
|
|
+ vsrcFiles, _ := utils.PostPara(r, "src")
|
|
|
+ vdestFile, _ := utils.PostPara(r, "dest")
|
|
|
+ vnfilenames, _ := utils.PostPara(r, "new") //Only use when rename or create new file / folder
|
|
|
|
|
|
//Check if operation valid.
|
|
|
if operation == "" {
|
|
@@ -1897,7 +1897,7 @@ func system_fs_handleOpr(w http.ResponseWriter, r *http.Request) {
|
|
|
}
|
|
|
|
|
|
//Get exists overwrite mode
|
|
|
- existsOpr, _ := utils.Mv(r, "existsresp", true)
|
|
|
+ existsOpr, _ := utils.PostPara(r, "existsresp")
|
|
|
|
|
|
//Check if use fast move instead
|
|
|
//Check if the source and destination folder are under the same root. If yes, use os.Rename for faster move operations
|
|
@@ -1949,7 +1949,7 @@ func system_fs_handleOpr(w http.ResponseWriter, r *http.Request) {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- existsOpr, _ := utils.Mv(r, "existsresp", true)
|
|
|
+ existsOpr, _ := utils.PostPara(r, "existsresp")
|
|
|
|
|
|
//Check if the user have space for the extra file
|
|
|
if !userinfo.StorageQuota.HaveSpace(filesystem.GetFileSize(rdestFile)) {
|
|
@@ -2122,9 +2122,9 @@ func system_fs_handleUserPreference(w http.ResponseWriter, r *http.Request) {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- key, _ := utils.Mv(r, "key", false)
|
|
|
- value, _ := utils.Mv(r, "value", false)
|
|
|
- remove, _ := utils.Mv(r, "remove", false)
|
|
|
+ key, _ := utils.GetPara(r, "key")
|
|
|
+ value, _ := utils.GetPara(r, "value")
|
|
|
+ remove, _ := utils.GetPara(r, "remove")
|
|
|
|
|
|
if key != "" && value == "" && remove == "" {
|
|
|
//Get mode. Read the prefernece with given key
|
|
@@ -2229,7 +2229,7 @@ func system_fs_listRoot(w http.ResponseWriter, r *http.Request) {
|
|
|
return
|
|
|
}
|
|
|
username := userinfo.Username
|
|
|
- userRoot, _ := utils.Mv(r, "user", false)
|
|
|
+ userRoot, _ := utils.GetPara(r, "user")
|
|
|
if userRoot == "true" {
|
|
|
type fileObject struct {
|
|
|
Filename string
|
|
@@ -2353,7 +2353,7 @@ func system_fs_getFileProperties(w http.ResponseWriter, r *http.Request) {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- vpath, err := utils.Mv(r, "path", true)
|
|
|
+ vpath, err := utils.PostPara(r, "path")
|
|
|
if err != nil {
|
|
|
utils.SendErrorResponse(w, "path not defined")
|
|
|
return
|
|
@@ -2446,11 +2446,21 @@ func system_fs_getFileProperties(w http.ResponseWriter, r *http.Request) {
|
|
|
*/
|
|
|
|
|
|
func system_fs_handleList(w http.ResponseWriter, r *http.Request) {
|
|
|
- currentDir, _ := utils.Mv(r, "dir", true)
|
|
|
+ currentDir, err := utils.PostPara(r, "dir")
|
|
|
+ if err != nil {
|
|
|
+ utils.SendErrorResponse(w, err.Error())
|
|
|
+ return
|
|
|
+ }
|
|
|
//Commented this line to handle dirname that contains "+" sign
|
|
|
//currentDir, _ = url.QueryUnescape(currentDir)
|
|
|
- sortMode, _ := utils.Mv(r, "sort", true)
|
|
|
- showHidden, _ := utils.Mv(r, "showHidden", true)
|
|
|
+ sortMode, err := utils.PostPara(r, "sort")
|
|
|
+ if err != nil {
|
|
|
+ utils.SendErrorResponse(w, err.Error())
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ showHidden, _ := utils.PostPara(r, "showHidden")
|
|
|
+
|
|
|
userinfo, err := userHandler.GetUserInfoFromRequest(w, r)
|
|
|
if err != nil {
|
|
|
//user not logged in. Redirect to login page.
|
|
@@ -2588,7 +2598,7 @@ func system_fs_handleList(w http.ResponseWriter, r *http.Request) {
|
|
|
|
|
|
//Handle getting a hash from a given contents in the given path
|
|
|
func system_fs_handleDirHash(w http.ResponseWriter, r *http.Request) {
|
|
|
- currentDir, err := utils.Mv(r, "dir", true)
|
|
|
+ currentDir, err := utils.GetPara(r, "dir")
|
|
|
if err != nil {
|
|
|
utils.SendErrorResponse(w, "Invalid dir given")
|
|
|
return
|
|
@@ -2666,19 +2676,19 @@ func system_fs_zipHandler(w http.ResponseWriter, r *http.Request) {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- opr, err := utils.Mv(r, "opr", true)
|
|
|
+ opr, err := utils.PostPara(r, "opr")
|
|
|
if err != nil {
|
|
|
utils.SendErrorResponse(w, "Invalid opr or opr not defined")
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- vsrc, _ := utils.Mv(r, "src", true)
|
|
|
+ vsrc, _ := utils.PostPara(r, "src")
|
|
|
if vsrc == "" {
|
|
|
utils.SendErrorResponse(w, "Invalid src paramter")
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- vdest, _ := utils.Mv(r, "dest", true)
|
|
|
+ vdest, _ := utils.PostPara(r, "dest")
|
|
|
rdest := ""
|
|
|
|
|
|
//Convert source path from JSON string to object
|
|
@@ -2783,7 +2793,7 @@ func system_fs_FileVersionHistory(w http.ResponseWriter, r *http.Request) {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- path, err := utils.Mv(r, "path", true)
|
|
|
+ path, err := utils.PostPara(r, "path")
|
|
|
if err != nil {
|
|
|
utils.SendErrorResponse(w, "Invalid path given")
|
|
|
return
|
|
@@ -2798,7 +2808,7 @@ func system_fs_FileVersionHistory(w http.ResponseWriter, r *http.Request) {
|
|
|
}
|
|
|
fshAbs := fsh.FileSystemAbstraction
|
|
|
|
|
|
- opr, _ := utils.Mv(r, "opr", true)
|
|
|
+ opr, _ := utils.PostPara(r, "opr")
|
|
|
|
|
|
rpath, err := fshAbs.VirtualPathToRealPath(subpath, userinfo.Username)
|
|
|
if err != nil {
|
|
@@ -2820,7 +2830,7 @@ func system_fs_FileVersionHistory(w http.ResponseWriter, r *http.Request) {
|
|
|
|
|
|
} else if opr == "delete" {
|
|
|
//Delete file history of given history ID
|
|
|
- historyID, err := utils.Mv(r, "histid", true)
|
|
|
+ historyID, err := utils.PostPara(r, "histid")
|
|
|
if err != nil {
|
|
|
utils.SendErrorResponse(w, "Invalid history id given")
|
|
|
return
|
|
@@ -2845,7 +2855,7 @@ func system_fs_FileVersionHistory(w http.ResponseWriter, r *http.Request) {
|
|
|
|
|
|
} else if opr == "restore" {
|
|
|
//Restore file history of given history ID
|
|
|
- historyID, err := utils.Mv(r, "histid", true)
|
|
|
+ historyID, err := utils.PostPara(r, "histid")
|
|
|
if err != nil {
|
|
|
utils.SendErrorResponse(w, "Invalid history id given")
|
|
|
return
|
|
@@ -2885,7 +2895,7 @@ func system_fs_clearVersionHistories() {
|
|
|
//Handle cache rendering with websocket pipeline
|
|
|
func system_fs_handleCacheRender(w http.ResponseWriter, r *http.Request) {
|
|
|
userinfo, _ := userHandler.GetUserInfoFromRequest(w, r)
|
|
|
- vpath, err := utils.Mv(r, "folder", false)
|
|
|
+ vpath, err := utils.GetPara(r, "folder")
|
|
|
if err != nil {
|
|
|
utils.SendErrorResponse(w, "Invalid folder paramter")
|
|
|
return
|
|
@@ -2912,13 +2922,13 @@ func system_fs_handleCacheRender(w http.ResponseWriter, r *http.Request) {
|
|
|
//Handle loading of one thumbnail
|
|
|
func system_fs_handleThumbnailLoad(w http.ResponseWriter, r *http.Request) {
|
|
|
userinfo, _ := userHandler.GetUserInfoFromRequest(w, r)
|
|
|
- vpath, err := utils.Mv(r, "vpath", false)
|
|
|
+ vpath, err := utils.GetPara(r, "vpath")
|
|
|
if err != nil {
|
|
|
utils.SendErrorResponse(w, "vpath not defined")
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- byteMode, _ := utils.Mv(r, "bytes", false)
|
|
|
+ byteMode, _ := utils.GetPara(r, "bytes")
|
|
|
isByteMode := byteMode == "true"
|
|
|
fsh, subpath, err := GetFSHandlerSubpathFromVpath(vpath)
|
|
|
if err != nil {
|
|
@@ -2963,7 +2973,7 @@ func system_fs_handleThumbnailLoad(w http.ResponseWriter, r *http.Request) {
|
|
|
//Handle file thumbnail caching
|
|
|
func system_fs_handleFolderCache(w http.ResponseWriter, r *http.Request) {
|
|
|
userinfo, _ := userHandler.GetUserInfoFromRequest(w, r)
|
|
|
- vfolderpath, err := utils.Mv(r, "folder", false)
|
|
|
+ vfolderpath, err := utils.GetPara(r, "folder")
|
|
|
if err != nil {
|
|
|
utils.SendErrorResponse(w, "folder not defined")
|
|
|
return
|
|
@@ -2986,13 +2996,13 @@ func system_fs_handleFolderSortModePreference(w http.ResponseWriter, r *http.Req
|
|
|
utils.SendErrorResponse(w, "User not logged in")
|
|
|
return
|
|
|
}
|
|
|
- folder, err := utils.Mv(r, "folder", true)
|
|
|
+ folder, err := utils.PostPara(r, "folder")
|
|
|
if err != nil {
|
|
|
utils.SendErrorResponse(w, "Invalid folder given")
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- opr, _ := utils.Mv(r, "opr", true)
|
|
|
+ opr, _ := utils.PostPara(r, "opr")
|
|
|
|
|
|
folder = filepath.ToSlash(filepath.Clean(folder))
|
|
|
|
|
@@ -3009,7 +3019,7 @@ func system_fs_handleFolderSortModePreference(w http.ResponseWriter, r *http.Req
|
|
|
}
|
|
|
utils.SendJSONResponse(w, string(js))
|
|
|
} else if opr == "set" {
|
|
|
- sortMode, err := utils.Mv(r, "mode", true)
|
|
|
+ sortMode, err := utils.PostPara(r, "mode")
|
|
|
if err != nil {
|
|
|
utils.SendErrorResponse(w, "Invalid sort mode given")
|
|
|
return
|
|
@@ -3030,7 +3040,7 @@ func system_fs_handleFolderSortModePreference(w http.ResponseWriter, r *http.Req
|
|
|
|
|
|
//Handle setting and loading of file permission on Linux
|
|
|
func system_fs_handleFilePermission(w http.ResponseWriter, r *http.Request) {
|
|
|
- file, err := utils.Mv(r, "file", true)
|
|
|
+ file, err := utils.PostPara(r, "file")
|
|
|
if err != nil {
|
|
|
utils.SendErrorResponse(w, "Invalid file")
|
|
|
return
|
|
@@ -3050,7 +3060,7 @@ func system_fs_handleFilePermission(w http.ResponseWriter, r *http.Request) {
|
|
|
utils.SendErrorResponse(w, err.Error())
|
|
|
return
|
|
|
}
|
|
|
- newMode, _ := utils.Mv(r, "mode", true)
|
|
|
+ newMode, _ := utils.PostPara(r, "mode")
|
|
|
if newMode == "" {
|
|
|
//Read the file mode
|
|
|
|