From a3a51464fd8cffa6d18fa3f18be9c699901abd0d Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Wed, 7 May 2008 21:16:35 +0000
Subject:

---
 core/src/ffluci/http.lua       | 10 ----------
 core/src/ffluci/sgi/haserl.lua |  7 +++++++
 core/src/ffluci/sgi/webuci.lua |  7 +++++++
 3 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'core/src/ffluci')

diff --git a/core/src/ffluci/http.lua b/core/src/ffluci/http.lua
index eab12e8f8..f4ba57094 100644
--- a/core/src/ffluci/http.lua
+++ b/core/src/ffluci/http.lua
@@ -33,14 +33,4 @@ if ENV and ENV.HASERLVER then
 	require("ffluci.sgi.haserl")
 elseif webuci then
 	require("ffluci.sgi.webuci")
-end
-
--- Asks the browser to redirect to "url"
-function redirect(url, qs)
-	if qs then
-		url = url .. "?" .. qs
-	end
-	
-	ffluci.http.status(302, "Found")
-	print("Location: " .. url .. "\n")
 end
\ No newline at end of file
diff --git a/core/src/ffluci/sgi/haserl.lua b/core/src/ffluci/sgi/haserl.lua
index 6fefd7baf..7e9854d7d 100644
--- a/core/src/ffluci/sgi/haserl.lua
+++ b/core/src/ffluci/sgi/haserl.lua
@@ -63,6 +63,13 @@ function ffluci.http.prepare_content(type)
 	print("Content-Type: "..type.."\n")
 end
 
+-- Asks the browser to redirect to "url"
+function ffluci.http.redirect(url)
+	ffluci.http.status(302, "Found")
+	ffluci.http.header("Location", url)
+	print()
+end
+
 -- Sets HTTP-Status-Header
 function ffluci.http.status(code, message)
 	print("Status: " .. tostring(code) .. " " .. message)
diff --git a/core/src/ffluci/sgi/webuci.lua b/core/src/ffluci/sgi/webuci.lua
index 87bb69302..5e17ab793 100644
--- a/core/src/ffluci/sgi/webuci.lua
+++ b/core/src/ffluci/sgi/webuci.lua
@@ -69,6 +69,13 @@ function ffluci.http.prepare_content(type)
 	print("Content-Type: "..type.."\n")
 end
 
+-- Asks the browser to redirect to "url"
+function ffluci.http.redirect(url)
+	ffluci.http.status(302, "Found")
+	ffluci.http.header("Location", url)
+	print()
+end
+
 -- Sets HTTP-Status-Header
 function ffluci.http.status(code, message)
 	print(webuci.env.SERVER_PROTOCOL .. " " .. tostring(code) .. " " .. message)
-- 
cgit v1.2.3