diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ffluci/http.lua | 8 | ||||
| -rw-r--r-- | src/ffluci/template.lua | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/ffluci/http.lua b/src/ffluci/http.lua index b7ce92ffab..06e1c43bda 100644 --- a/src/ffluci/http.lua +++ b/src/ffluci/http.lua @@ -54,11 +54,17 @@ function request_redirect(category, module, action, ...) module = module or "index" action = action or "index" - local pattern = os.getenv("SCRIPT_NAME") .. "/%s/%s/%s" + local pattern = script_name() .. "/%s/%s/%s" redirect(pattern:format(category, module, action), ...) end +-- Returns the script name +function script_name() + return ENV.SCRIPT_NAME +end + + -- Gets form value from key function formvalue(key, default) local c = formvalues() diff --git a/src/ffluci/template.lua b/src/ffluci/template.lua index 589f43c679..502013684b 100644 --- a/src/ffluci/template.lua +++ b/src/ffluci/template.lua @@ -29,6 +29,7 @@ require("ffluci.config") require("ffluci.util") require("ffluci.fs") require("ffluci.i18n") +require("ffluci.http") require("ffluci.model.uci") viewdir = ffluci.config.path .. "/view/" @@ -53,7 +54,7 @@ compiler_enable_bytecode = false viewns = { translate = ffluci.i18n.translate, config = function(...) return ffluci.model.uci.get(...) or "" end, - controller = os.getenv("SCRIPT_NAME"), + controller = ffluci.http.script_name(), media = ffluci.config.main.mediaurlbase, write = io.write, include = function(name) Template(name):render(getfenv(2)) end, |