Use luci.fs.access instead of luci.fs.isfile where applicable

diff --git a/applications/luci-ddns/luasrc/controller/ddns.lua b/applications/luci-ddns/luasrc/controller/ddns.lua
index 0adc6abb5a6c882736b41d05676058e766fc04cb..6adbbb0cae7cdb70abd41a1232754d69b5361fce 100644 (file)
--- a/applications/luci-ddns/luasrc/controller/ddns.lua
+++ b/applications/luci-ddns/luasrc/controller/ddns.lua
@@ -17,7 +17,7 @@ module("luci.controller.ddns", package.seeall)
 function index()
        require("luci.i18n")
        luci.i18n.loadc("ddns")
-       if not luci.fs.isfile("/etc/config/ddns") then
+       if not luci.fs.access("/etc/config/ddns") then
                return
        end
        

diff --git a/applications/luci-hd_idle/luasrc/controller/hd_idle.lua b/applications/luci-hd_idle/luasrc/controller/hd_idle.lua
index 45d102cc1e620b207255c2d3b9f28321e7d50851..5dfbe16ea08ae388a03587060485929148cef300 100644 (file)
--- a/applications/luci-hd_idle/luasrc/controller/hd_idle.lua
+++ b/applications/luci-hd_idle/luasrc/controller/hd_idle.lua
@@ -18,7 +18,7 @@ module("luci.controller.hd_idle", package.seeall)
 function index()
        require("luci.i18n")
        luci.i18n.loadc("hd_idle")
-       if not luci.fs.isfile("/etc/config/hd-idle") then
+       if not luci.fs.access("/etc/config/hd-idle") then
                return
        end
 

diff --git a/applications/luci-initmgr/luasrc/controller/init.lua b/applications/luci-initmgr/luasrc/controller/init.lua
index aecf6c1863e4328499cb84aca49dae4a697cb310..fbbc7270f9d5989fdab7b0b9c304f09fc7638457 100644 (file)
--- a/applications/luci-initmgr/luasrc/controller/init.lua
+++ b/applications/luci-initmgr/luasrc/controller/init.lua
@@ -15,7 +15,7 @@ $Id$
 module("luci.controller.init", package.seeall)
 
 function index()
-       if not luci.fs.isfile("/etc/rc.common") then
+       if not luci.fs.access("/etc/rc.common") then
                return
        end
 

diff --git a/applications/luci-mmc_over_gpio/luasrc/controller/mmc_over_gpio.lua b/applications/luci-mmc_over_gpio/luasrc/controller/mmc_over_gpio.lua
index ce244cb509119d105e68a08299dbece656ffdabc..7beaa144f0f1d0adbc31b980f3fac751660f44bd 100644 (file)
--- a/applications/luci-mmc_over_gpio/luasrc/controller/mmc_over_gpio.lua
+++ b/applications/luci-mmc_over_gpio/luasrc/controller/mmc_over_gpio.lua
@@ -18,7 +18,7 @@ module("luci.controller.mmc_over_gpio", package.seeall)
 function index()
        require("luci.i18n")
        luci.i18n.loadc("mmc_over_gpio")
-       if not luci.fs.isfile("/etc/config/mmc_over_gpio") then
+       if not luci.fs.access("/etc/config/mmc_over_gpio") then
                return
        end
 

diff --git a/applications/luci-ntpc/luasrc/controller/ntpc.lua b/applications/luci-ntpc/luasrc/controller/ntpc.lua
index 8fa690f664a896192c3913ef637e0b8bc25f9026..92906446802b9abf56dd459fc3d0e4e652296955 100644 (file)
--- a/applications/luci-ntpc/luasrc/controller/ntpc.lua
+++ b/applications/luci-ntpc/luasrc/controller/ntpc.lua
@@ -17,7 +17,7 @@ module("luci.controller.ntpc", package.seeall)
 function index()
        require("luci.i18n")
        luci.i18n.loadc("ntpc")
-       if not luci.fs.isfile("/etc/config/ntpclient") then
+       if not luci.fs.access("/etc/config/ntpclient") then
                return
        end
        

diff --git a/applications/luci-olsr/luasrc/controller/olsr.lua b/applications/luci-olsr/luasrc/controller/olsr.lua
index 766107ee9a5789d994ced59272249b6a6975160f..652f6b9d2c6e202eda1f4739cf099953d6c404e2 100644 (file)
--- a/applications/luci-olsr/luasrc/controller/olsr.lua
+++ b/applications/luci-olsr/luasrc/controller/olsr.lua
@@ -1,7 +1,7 @@
 module("luci.controller.olsr", package.seeall)
 
 function index()
-       if not luci.fs.isfile("/etc/config/olsrd") then
+       if not luci.fs.access("/etc/config/olsrd") then
                return
        end
 

diff --git a/applications/luci-p910nd/luasrc/controller/p910nd.lua b/applications/luci-p910nd/luasrc/controller/p910nd.lua
index 8cc0e7197af07bcf452c494efb2ab1e2de451753..75b2693d40fbe8c299392de6b69dd3c5edc5d4cf 100644 (file)
--- a/applications/luci-p910nd/luasrc/controller/p910nd.lua
+++ b/applications/luci-p910nd/luasrc/controller/p910nd.lua
@@ -18,7 +18,7 @@ module("luci.controller.p910nd", package.seeall)
 function index()
        require("luci.i18n")
        luci.i18n.loadc("p910nd")
-       if not luci.fs.isfile("/etc/config/p910nd") then
+       if not luci.fs.access("/etc/config/p910nd") then
                return
        end
 

diff --git a/applications/luci-polipo/luasrc/controller/polipo.lua b/applications/luci-polipo/luasrc/controller/polipo.lua
index c3965ee2e06754904188e5a638691656fd8efe12..949f80a6219fc60ade7765b7a3a38f2f08b551db 100644 (file)
--- a/applications/luci-polipo/luasrc/controller/polipo.lua
+++ b/applications/luci-polipo/luasrc/controller/polipo.lua
@@ -14,7 +14,7 @@ $Id$
 module("luci.controller.polipo", package.seeall)
 
 function index()
-       if not luci.fs.isfile("/etc/config/polipo") then
+       if not luci.fs.access("/etc/config/polipo") then
                return
        end
        

diff --git a/applications/luci-qos/luasrc/controller/qos.lua b/applications/luci-qos/luasrc/controller/qos.lua
index 5a9ef5e152f3bbca6f97f9e03fda5178e73b199d..970dd3d6019ec47469b71f792afb29089df6f463 100644 (file)
--- a/applications/luci-qos/luasrc/controller/qos.lua
+++ b/applications/luci-qos/luasrc/controller/qos.lua
@@ -14,7 +14,7 @@ $Id$
 module("luci.controller.qos", package.seeall)
 
 function index()
-       if not luci.fs.isfile("/etc/config/qos") then
+       if not luci.fs.access("/etc/config/qos") then
                return
        end
        

diff --git a/applications/luci-samba/luasrc/controller/samba.lua b/applications/luci-samba/luasrc/controller/samba.lua
index a698777c2e11c8d29bf0466cc912f7f9f5ec9113..75cb65a0b2a432cdda7fe874b9660ed682efb836 100644 (file)
--- a/applications/luci-samba/luasrc/controller/samba.lua
+++ b/applications/luci-samba/luasrc/controller/samba.lua
@@ -15,7 +15,7 @@ $Id$
 module("luci.controller.samba", package.seeall)
 
 function index()
-       if not luci.fs.isfile("/etc/config/samba") then
+       if not luci.fs.access("/etc/config/samba") then
                return
        end
        require("luci.i18n")

diff --git a/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua b/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
index 0aa66362bdd88348f59202221b34f5bcdcaace99..940d2265c7c3a9a683263ea8fbfdb38d5124a0ad 100644 (file)
--- a/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
+++ b/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
@@ -32,7 +32,7 @@ function index()
        -- override entry(): check for existance <plugin>.so where <plugin> is derived from the called path
        function _entry( path, ... )
                local file = path[5] or path[4]
-               if luci.fs.isfile( "/usr/lib/collectd/" .. file .. ".so" ) then
+               if luci.fs.access( "/usr/lib/collectd/" .. file .. ".so" ) then
                        entry( path, ... )
                end
        end

diff --git a/applications/luci-statistics/luasrc/view/admin_statistics/networkplugins.htm b/applications/luci-statistics/luasrc/view/admin_statistics/networkplugins.htm
index e29d97c9e3f93c03c3d4ac0120946730a131ef1f..54ba2b0e263824d7e2895b2d7b23c50be9349782 100644 (file)
--- a/applications/luci-statistics/luasrc/view/admin_statistics/networkplugins.htm
+++ b/applications/luci-statistics/luasrc/view/admin_statistics/networkplugins.htm
@@ -22,7 +22,7 @@ about open tcp connections, interface traffic, iptables rules etc.%></p>
 <p><%:stat_networkplugins_installed Installed network plugins:%>
        <ul>
                <% for plugin, desc in pairs(plugins) do %>
-                       <% if luci.fs.isfile("/usr/lib/collectd/" .. plugin .. ".so") then %>
+                       <% if luci.fs.access("/usr/lib/collectd/" .. plugin .. ".so") then %>
                                <li><a href="<%=controller%>/admin/statistics/collectd/network/<%=plugin%>"><%=desc%></a></li>
                        <% end %>
                <% end %>

diff --git a/applications/luci-statistics/luasrc/view/admin_statistics/outputplugins.htm b/applications/luci-statistics/luasrc/view/admin_statistics/outputplugins.htm
index d230109cc06ae45c5ec6ec670d790e22f57e0c11..e79e2f49f5dba2dad607283e3af4f41395a041aa 100644 (file)
--- a/applications/luci-statistics/luasrc/view/admin_statistics/outputplugins.htm
+++ b/applications/luci-statistics/luasrc/view/admin_statistics/outputplugins.htm
@@ -23,7 +23,7 @@ and to transmit the data over the network to other collectd instances.%></p>
 <p><%:stat_outputplugins_installed Installed output plugins:%>
        <ul>
                <% for plugin, desc in pairs(plugins) do %>
-                       <% if luci.fs.isfile("/usr/lib/collectd/" .. plugin .. ".so") then %>
+                       <% if luci.fs.access("/usr/lib/collectd/" .. plugin .. ".so") then %>
                                <li><a href="<%=controller%>/admin/statistics/collectd/output/<%=plugin%>"><%=desc%></a></li>
                        <% end %>
                <% end %>

diff --git a/applications/luci-statistics/luasrc/view/admin_statistics/systemplugins.htm b/applications/luci-statistics/luasrc/view/admin_statistics/systemplugins.htm
index bb63228b67266d83e51c7436a030331c7b1a8bf5..0c1b2b52bb8263a1528bc676f6a7cd3d9ca5047b 100644 (file)
--- a/applications/luci-statistics/luasrc/view/admin_statistics/systemplugins.htm
+++ b/applications/luci-statistics/luasrc/view/admin_statistics/systemplugins.htm
@@ -19,7 +19,7 @@ $Id$
 <p><%:stat_systemplugins_desc System plugins collecting values about system state and ressource usage on the device.:%>
        <ul>
                <% for plugin, desc in pairs(plugins) do %>
-                       <% if luci.fs.isfile("/usr/lib/collectd/" .. plugin .. ".so") then %>
+                       <% if luci.fs.access("/usr/lib/collectd/" .. plugin .. ".so") then %>
                                <li><a href="<%=controller%>/admin/statistics/collectd/system/<%=plugin%>"><%=desc%></a></li>
                        <% end %>
                <% end %>

diff --git a/applications/luci-tinyproxy/luasrc/controller/tinyproxy.lua b/applications/luci-tinyproxy/luasrc/controller/tinyproxy.lua
index 2ecfb9383e36e66b15ea20f6619a4e45908c3685..fb8d9e2b5d9a737e7d234a68bb61ff08f54ee94a 100644 (file)
--- a/applications/luci-tinyproxy/luasrc/controller/tinyproxy.lua
+++ b/applications/luci-tinyproxy/luasrc/controller/tinyproxy.lua
@@ -15,7 +15,7 @@ $Id$
 module("luci.controller.tinyproxy", package.seeall)
 
 function index()
-       if not luci.fs.isfile("/etc/config/tinyproxy") then
+       if not luci.fs.access("/etc/config/tinyproxy") then
                return
        end
        

diff --git a/applications/luci-upnp/luasrc/controller/upnp.lua b/applications/luci-upnp/luasrc/controller/upnp.lua
index a7fd66fc11848ddde5d8138f45f1736b38f84c47..c88abddc24f33f78d4689d09ef18e268d7b25eae 100644 (file)
--- a/applications/luci-upnp/luasrc/controller/upnp.lua
+++ b/applications/luci-upnp/luasrc/controller/upnp.lua
@@ -15,7 +15,7 @@ $Id$
 module("luci.controller.upnp", package.seeall)
 
 function index()
-       if not luci.fs.isfile("/etc/config/upnpd") then
+       if not luci.fs.access("/etc/config/upnpd") then
                return
        end
        

diff --git a/applications/luci-ushare/luasrc/controller/ushare.lua b/applications/luci-ushare/luasrc/controller/ushare.lua
index 2fdea4e83078404f134e09409d8a7735419f4c5c..958f247d98bd7a3d5fa0418a8d1364e0af77abf5 100644 (file)
--- a/applications/luci-ushare/luasrc/controller/ushare.lua
+++ b/applications/luci-ushare/luasrc/controller/ushare.lua
@@ -18,7 +18,7 @@ module("luci.controller.ushare", package.seeall)
 function index()
        require("luci.i18n")
        luci.i18n.loadc("ushare")
-       if not luci.fs.isfile("/etc/config/ushare") then
+       if not luci.fs.access("/etc/config/ushare") then
                return
        end
 

diff --git a/applications/luci-uvc_streamer/luasrc/controller/uvc_streamer.lua b/applications/luci-uvc_streamer/luasrc/controller/uvc_streamer.lua
index 1766c2b11615363694357439fb8610345e028b3c..64491dc9dcc6dfe364f5c5fd048f59910842b840 100644 (file)
--- a/applications/luci-uvc_streamer/luasrc/controller/uvc_streamer.lua
+++ b/applications/luci-uvc_streamer/luasrc/controller/uvc_streamer.lua
@@ -18,7 +18,7 @@ module("luci.controller.uvc_streamer", package.seeall)
 function index()
        require("luci.i18n")
        luci.i18n.loadc("uvc_streamer")
-       if not luci.fs.isfile("/etc/config/uvc-streamer") then
+       if not luci.fs.access("/etc/config/uvc-streamer") then
                return
        end
 

diff --git a/modules/admin-full/luasrc/model/cbi/admin_index/luci.lua b/modules/admin-full/luasrc/model/cbi/admin_index/luci.lua
index 3de87104493663bff9bce98c41f2809f5032bf81..9a0282f3a763b6ea37db73a01053392860ae4a10 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_index/luci.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_index/luci.lua
@@ -28,7 +28,7 @@ l = c:option(ListValue, "lang", translate("language"))
 
 local i18ndir = luci.i18n.i18ndir .. "default."
 for k, v in pairs(luci.config.languages) do
-       if k:sub(1, 1) ~= "." and luci.fs.isfile(i18ndir .. k:gsub("_", "-") .. ".lua") then
+       if k:sub(1, 1) ~= "." and luci.fs.access(i18ndir .. k:gsub("_", "-") .. ".lua") then
                l:value(k, v)
        end
 end

diff --git a/modules/admin-mini/luasrc/model/cbi/mini/luci.lua b/modules/admin-mini/luasrc/model/cbi/mini/luci.lua
index f9365c9062801f8f1589b9d4bc5294966255a898..819a9b64d3e1b8b0da8ae4768fae1e81f579ee1d 100644 (file)
--- a/modules/admin-mini/luasrc/model/cbi/mini/luci.lua
+++ b/modules/admin-mini/luasrc/model/cbi/mini/luci.lua
@@ -28,7 +28,7 @@ l = c:option(ListValue, "lang", translate("language"))
 
 local i18ndir = luci.i18n.i18ndir .. "default."
 for k, v in pairs(luci.config.languages) do
-       if k:sub(1, 1) ~= "." and luci.fs.isfile(i18ndir .. k:gsub("_", "-") .. ".lua") then
+       if k:sub(1, 1) ~= "." and luci.fs.access(i18ndir .. k:gsub("_", "-") .. ".lua") then
                l:value(k, v)
        end
 end

diff --git a/modules/freifunk/luasrc/controller/freifunk/freifunk.lua b/modules/freifunk/luasrc/controller/freifunk/freifunk.lua
index 533211b0012a564c2a5ea3db5a74e80e364b4f18..ff739fd5f83aa4ace16a1cd056a3f8aa0ecc6ced 100644 (file)
--- a/modules/freifunk/luasrc/controller/freifunk/freifunk.lua
+++ b/modules/freifunk/luasrc/controller/freifunk/freifunk.lua
@@ -52,7 +52,7 @@ function index()
 
        assign({"freifunk", "olsr"}, {"admin", "status", "olsr"}, "OLSR", 30)
 
-       if luci.fs.isfile("/etc/config/luci_statistics") then
+       if luci.fs.access("/etc/config/luci_statistics") then
                assign({"freifunk", "graph"}, {"admin", "statistics", "graph"}, i18n("stat_statistics", "Statistiken"), 40)
        end