* applications/sgi-haserl: Added ffluci.http.upload for file uploads

* applications/sgi-webuci: Added stub for ffluci.http.upload

applications/sgi-haserl/src/sgi/haserl.lua

@@ -24,6 +24,7 @@ limitations under the License.
 
 ]]--
 module("ffluci.sgi.haserl", package.seeall)
+require("ffluci.fs")
 
 -- Environment Table
 ffluci.http.env = ENV
@@ -70,6 +71,17 @@ function ffluci.http.redirect(url)
 	print()
 end
 
+-- Returns the path of an uploaded file
+-- WARNING! File uploads can be easily spoofed! Do additional sanity checks!
+function ffluci.http.upload(name)
+	local fpath = ffluci.http.formvalue(name)
+	local fname = ffluci.http.formvalue(name .. "_name")
+	
+	if fpath and fname and ffluci.fs.isfile(fpath) then
+		return fpath
+	end
+end
+
 -- Sets HTTP-Status-Header
 function ffluci.http.status(code, message)
 	print("Status: " .. tostring(code) .. " " .. message)

applications/sgi-webuci/src/sgi/webuci.lua

@@ -76,6 +76,12 @@ function ffluci.http.redirect(url)
 	print()
 end
 
+-- Returns the path of an uploaded file
+-- WARNING! File uploads can be easily spoofed! Do additional sanity checks!
+function ffluci.http.upload(name)
+	-- To be implemented
+end
+
 -- Sets HTTP-Status-Header
 function ffluci.http.status(code, message)
 	print(webuci.env.SERVER_PROTOCOL .. " " .. tostring(code) .. " " .. message)

modules/admin-core/src/controller/admin/system.lua

@@ -178,11 +178,10 @@ function action_upgrade()
 	local ret  = nil
 	local plat = ffluci.fs.mtime("/lib/upgrade/platform.sh")
 	
-	local image   = ffluci.http.formvalue("image")
-	local imgname = ffluci.http.formvalue("image_name")
+	local image   = ffluci.http.upload("image")
 	local keepcfg = ffluci.http.formvalue("keepcfg")
 	
-	if plat and imgname then
+	if plat and image then
 		local kpattern = nil
 		if keepcfg then
 			local files = ffluci.model.uci.sections("luci").flash_keep