Assign correct path attribute to nodes

[project/luci.git] / libs / web / luasrc / dispatcher.lua

diff --git a/libs/web/luasrc/dispatcher.lua b/libs/web/luasrc/dispatcher.lua
index 645ea97..5fb50dc 100644 (file)
--- a/libs/web/luasrc/dispatcher.lua
+++ b/libs/web/luasrc/dispatcher.lua
@@ -108,6 +108,7 @@ function httpdispatch(request)
 
        local stat, err = util.copcall(dispatch, context.request)
        if not stat then
+               luci.util.perror(err)
                error500(err)
        end
 
@@ -133,7 +134,8 @@ function dispatch(request)
 
        local track = {}
        local args = {}
-       context.args = args
+       ctx.args = args
+       ctx.requestargs = ctx.requestargs or args
        local n
 
        for i, s in ipairs(request) do
@@ -298,28 +300,35 @@ end
 -- @param path         Controller base directory
 -- @param suffix       Controller file suffix
 function createindex_plain(path, suffix)
+       local controllers = util.combine(
+               luci.fs.glob(path .. "*" .. suffix) or {},
+               luci.fs.glob(path .. "*/*" .. suffix) or {}
+       )
+
        if indexcache then
                local cachedate = fs.mtime(indexcache)
-               if cachedate and cachedate > fs.mtime(path) then
+               if cachedate then
+                       local realdate = 0
+                       for _, obj in ipairs(controllers) do
+                               local omtime = fs.mtime(path .. "/" .. obj)
+                               realdate = (omtime and omtime > realdate) and omtime or realdate
+                       end
 
-                       assert(
-                               sys.process.info("uid") == fs.stat(indexcache, "uid")
-                               and fs.stat(indexcache, "mode") == "rw-------",
-                               "Fatal: Indexcache is not sane!"
-                       )
+                       if cachedate > realdate then
+                               assert(
+                                       sys.process.info("uid") == fs.stat(indexcache, "uid")
+                                       and fs.stat(indexcache, "mode") == "rw-------",
+                                       "Fatal: Indexcache is not sane!"
+                               )
 
-                       index = loadfile(indexcache)()
-                       return index
+                               index = loadfile(indexcache)()
+                               return index
+                       end
                end
        end
 
        index = {}
 
-       local controllers = util.combine(
-               luci.fs.glob(path .. "*" .. suffix) or {},
-               luci.fs.glob(path .. "*/*" .. suffix) or {}
-       )
-
        for i,c in ipairs(controllers) do
                local module = "luci.controller." .. c:sub(#path+1, #c-#suffix):gsub("/", ".")
                local mod = require(module)
@@ -345,9 +354,11 @@ function createtree()
 
        local ctx  = context
        local tree = {nodes={}}
+       local modi = {}
 
        ctx.treecache = setmetatable({}, {__mode="v"})
        ctx.tree = tree
+       ctx.modifiers = modi
 
        -- Load default translation
        require "luci.i18n".loadc("default")
@@ -360,9 +371,30 @@ function createtree()
                v()
        end
 
+       local function modisort(a,b)
+               return modi[a].order < modi[b].order
+       end
+
+       for _, v in util.spairs(modi, modisort) do
+               scope._NAME = v.module
+               setfenv(v.func, scope)
+               v.func()
+       end
+
        return tree
 end
 
+--- Register a tree modifier.
+-- @param      func    Modifier function
+-- @param      order   Modifier order value (optional)
+function modifier(func, order)
+       context.modifiers[#context.modifiers+1] = {
+               func = func,
+               order = order or 0,
+               module = getfenv(2)._NAME
+       }
+end
+
 --- Clone a node of the dispatching tree to another position.
 -- @param      path    Virtual path destination
 -- @param      clone   Virtual path source
@@ -406,7 +438,6 @@ function node(...)
        local c = _create_node({...})
 
        c.module = getfenv(2)._NAME
-       c.path = arg
        c.auto = nil
 
        return c
@@ -422,10 +453,11 @@ function _create_node(path, cache)
        local c = cache[name]
 
        if not c then
+               local new = {nodes={}, auto=true, path=util.clone(path)}
                local last = table.remove(path)
+
                c = _create_node(path, cache)
 
-               local new = {nodes={}, auto=true}
                c.nodes[last] = new
                cache[name] = new
 
@@ -498,7 +530,7 @@ function template(name)
 end
 
 --- Create a CBI model dispatching target.
--- @param      model   CBI model tpo be rendered
+-- @param      model   CBI model to be rendered
 function cbi(model, config)
        config = config or {}
        return function(...)
@@ -520,12 +552,37 @@ function cbi(model, config)
                        end
                end
 
+               if config.on_valid_to and state and state > 0 and state < 2 then
+                       luci.http.redirect(config.on_valid_to)
+                       return
+               end
+
+               if config.on_changed_to and state and state > 1 then
+                       luci.http.redirect(config.on_changed_to)
+                       return
+               end
+
+               if config.on_success_to and state and state > 0 then
+                       luci.http.redirect(config.on_success_to)
+                       return
+               end
+
+               if config.state_handler then
+                       if not config.state_handler(state, maps) then
+                               return
+                       end
+               end
+
+               local pageaction = true
                http.header("X-CBI-State", state or 0)
                luci.template.render("cbi/header", {state = state})
                for i, res in ipairs(maps) do
                        res:render()
+                       if res.pageaction == false then
+                               pageaction = false
+                       end
                end
-               luci.template.render("cbi/footer", {state = state, autoapply = config.autoapply})
+               luci.template.render("cbi/footer", {pageaction=pageaction, state = state, autoapply = config.autoapply})
        end
 end