Sort file list, remove spaces and add path for new files. Bumped to 0.5.1v0.5.1

Plus some cleanup

2 files changed, 12 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index 4a1ef9f..d9e9ff2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 APP_NAME=squid
 PACKAGE=acf-$(APP_NAME)
-VERSION=0.5.0
+VERSION=0.5.1
 
 APP_DIST=\
 	squid*	\
diff --git a/squid-model.lua b/squid-model.lua
index b874818..43c333e 100644
--- a/squid-model.lua
+++ b/squid-model.lua
@@ -52,7 +52,7 @@ end
 
 read_digest_userlist = function()
 	local retval = modelfunctions.getfiledetails(squiddigestusers)
-	retval.value.filecontent.descr = "List of username:password entries"
+	retval.value.filecontent.descr = "List of username:password(plaintext) entries, one per line."
 
 	-- check to see if the file is being used
 	configcontent = configcontent or fs.read_file(squidconf) or ""
@@ -61,7 +61,7 @@ read_digest_userlist = function()
 	retval.value.status = cfe({ errtxt="Digest authentication not enabled", label="User list status" })
 	for i,line in ipairs(config) do
 		if line[1] == "auth_param" and line[2] == "digest" and line[3] == "program" then
-			if line[5] == squiddigestusers then
+			if line[#line] == squiddigestusers then
 				retval.value.status.value = "User list in use"
 				retval.value.status.errtxt = nil
 			else
@@ -113,7 +113,7 @@ enable_digest_userlist = function()
 	fs.write_file(squidconf, string.gsub(table.concat(lines, "\n"), "\n+$", ""))
 	config = nil
 	configcontent = nil
-	return cfe({ value="Successfully enabled user list", label="Enable disgest user list result" })
+	return cfe({ value="Successfully enabled user list", label="Enable digest user list result" })
 end
 
 --[[
@@ -395,6 +395,7 @@ function listfiles()
 			table.insert(retval.value, file)
 		end
 	end
+	table.sort(retval.value)
 	return retval
 end
 
@@ -405,20 +406,24 @@ end
 
 function createfile(filedetails)
 	local success = true
+	local path = string.match(filedetails.value.filename.value, "^%s*(.*%S)%s*$") or ""
+	if not string.find(path, "/") then
+		path = baseurl..path
+	end
 
-	if not validator.is_valid_filename(filedetails.value.filename.value, baseurl) then
+	if not validator.is_valid_filename(path, baseurl) then
 		success = false
 		filedetails.value.filename.errtxt = "Invalid filename"
 	else
 		if not fs.is_dir(baseurl) then fs.create_directory(baseurl) end
-		if posix.stat(filedetails.value.filename.value) then
+		if posix.stat(path) then
 			success = false
 			filedetails.value.filename.errtxt = "Filename already exists"
 		end
 	end
 
 	if success then
-		fs.create_file(filedetails.value.filename.value)
+		fs.create_file(path)
 	else
 		filedetails.errtxt = "Failed to Create File"
 	end