* Added support for first-level controllers

[project/luci.git] / core / src / dispatcher.lua

diff --git a/core/src/dispatcher.lua b/core/src/dispatcher.lua
index a05c8805cbd79c7921186f9089d8d7a48b0c98a5..e820a8864bb7a2387a0397bccc998f41e98e7ddd 100644 (file)
--- a/core/src/dispatcher.lua
+++ b/core/src/dispatcher.lua
@@ -126,8 +126,14 @@ end
 function createindex()
        local root = ffluci.sys.libpath() .. "/controller/"
        local suff = ".lua"
-       for i,c in ipairs(ffluci.fs.glob(root .. "*/*" .. suff)) do
-               c = "ffluci.controller." .. c:sub(#root+1, #c-#suff):gsub("/", ".", 1)
+       
+       local controllers = ffluci.util.combine(
+               ffluci.fs.glob(root .. "*" .. suff),
+               ffluci.fs.glob(root .. "*/*" .. suff)
+       )
+       
+       for i,c in ipairs(controllers) do
+               c = "ffluci.controller." .. c:sub(#root+1, #c-#suff):gsub("/", ".")
                stat, mod = pcall(require, c)
        
                if stat and mod and type(mod.index) == "function" then