From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 15 Jan 2015 14:09:02 +0000 (+0100)
Subject: luci-theme-freifunk-generic: switch to nixio.fs
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=921df0f3fc47720f280c5b758154d69acabb87d1;p=oweals%2Fluci.git

luci-theme-freifunk-generic: switch to nixio.fs

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
---

diff --git a/themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm b/themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm
index 3eacf0a1e..20058be6c 100644
--- a/themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm
+++ b/themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm
@@ -11,7 +11,7 @@ You may obtain a copy of the License at
 -%>
 
 <%
-	local fs   = require "luci.fs"
+	local fs   = require "nixio.fs"
 	local sys  = require "luci.sys"
 	local util = require "luci.util"
 	local http = require "luci.http"
@@ -50,20 +50,20 @@ You may obtain a copy of the License at
 	local banner = false
 	local show_comm = true
 
-	local lo = fs.glob("/www/luci-static/resources/custom_logo.*")
-	if lo[1] then
-		logo = string.gsub(lo[1], "/www", "")
+	local file
+	for file in fs.glob("/www/luci-static/resources/custom_logo.*") do
+		logo = string.gsub(file, "/www", "")
+		break
 	end
 
-	local lon = fs.glob("/www/luci-static/resources/custom_logo_only.*")
-	if lon[1] then
-		logo = string.gsub(lon[1], "/www", "")
+	for file in fs.glob("/www/luci-static/resources/custom_logo_only.*") do
+		logo = string.gsub(file, "/www", "")
 		show_comm = false
+		break
 	end
 
-	local hea = fs.glob("/www/luci-static/resources/custom_header.*")
-	if hea[1] then
-		logo = string.gsub(hea[1], "/www", "")
+	for file in fs.glob("/www/luci-static/resources/custom_header.*") do
+		logo = string.gsub(file, "/www", "")
 		show_comm = false
 		banner = true
 	end