diff options
| -rw-r--r-- | app/acf_www-controller.lua | 2 | ||||
| -rw-r--r-- | lib/roles.lua | 4 | ||||
| -rwxr-xr-x | www/cgi-bin/mvc.lua | 15 |
3 files changed, 3 insertions, 18 deletions
diff --git a/app/acf_www-controller.lua b/app/acf_www-controller.lua index 2913f1e..5803464 100644 --- a/app/acf_www-controller.lua +++ b/app/acf_www-controller.lua @@ -98,7 +98,7 @@ find_template = function ( appdir, prefix, controller, action, viewtype ) end end -- not found, so try one level higher - if prefix == "." then -- already at the top level - fail + if prefix == "/" then -- already at the top level - fail return nil end prefix = posix.dirname (prefix) diff --git a/lib/roles.lua b/lib/roles.lua index f38ce6a..2bceb01 100644 --- a/lib/roles.lua +++ b/lib/roles.lua @@ -38,10 +38,10 @@ get_controllers = function(self,pre,controller) filename = string.match(v,"[^/]*.lua") name = string.match(filename,"[^.]*") sname = string.match(filename,"[^-]*") - temp[prefix.."/"..sname] = {path=path,prefix=prefix,filename=filename,name=name,sname=sname} + temp[prefix..sname] = {path=path,prefix=prefix,filename=filename,name=name,sname=sname} end if pre and controller then - return temp[pre.."/"..controller] + return temp[pre..controller] else return temp end diff --git a/www/cgi-bin/mvc.lua b/www/cgi-bin/mvc.lua index 4aeb8fa..c7afdcd 100755 --- a/www/cgi-bin/mvc.lua +++ b/www/cgi-bin/mvc.lua @@ -225,21 +225,6 @@ soft_require = function (self, name ) return nil end --- see man basename.1 -basename = function (string, suffix) - string = string or "" - local basename = string.gsub (string, "[^/]*/", "") - if suffix then - basename = string.gsub ( basename, suffix, "" ) - end - return basename -end - --- see man dirname.1 -dirname = function (string) - return (string.gsub (string or "", "/?[^/]*$", "")) -end - -- look in various places for a config file, and store it in self.conf read_config = function( self, appname ) appname = appname or self.conf.appname |