From: Steven Barth <steven@midlink.org>
Date: Tue, 13 May 2008 09:21:10 +0000 (+0000)
Subject: * applications/sgi-haserl: Added ffluci.http.upload for file uploads
X-Git-Tag: 0.8.0~1044
X-Git-Url: http://git.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=b481ea4934cd3c28a9dd7719e5993fc9c21b0249

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

diff --git a/applications/sgi-haserl/src/sgi/haserl.lua b/applications/sgi-haserl/src/sgi/haserl.lua
index 027697e2e4..0e388391db 100644
--- a/applications/sgi-haserl/src/sgi/haserl.lua
+++ b/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)
diff --git a/applications/sgi-webuci/src/sgi/webuci.lua b/applications/sgi-webuci/src/sgi/webuci.lua
index bc1c7be7a2..d3d4cd4dc2 100644
--- a/applications/sgi-webuci/src/sgi/webuci.lua
+++ b/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)
diff --git a/modules/admin-core/src/controller/admin/system.lua b/modules/admin-core/src/controller/admin/system.lua
index 7a927d6047..a612660092 100644
--- a/modules/admin-core/src/controller/admin/system.lua
+++ b/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