Rework LuCI build system

 * Rename subdirectories to their repective OpenWrt package names
 * Make each LuCI module its own standalone package
 * Deploy a shared luci.mk which is used by each module Makefile

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

5 files changed, 0 insertions, 499 deletions

diff --git a/applications/luci-splash/luasrc/view/admin_status/splash.htm b/applications/luci-splash/luasrc/view/admin_status/splash.htm
deleted file mode 100644
index 61b32bab9e..0000000000
--- a/applications/luci-splash/luasrc/view/admin_status/splash.htm
+++ /dev/null
@@ -1,294 +0,0 @@
-<%#
-LuCI - Lua Configuration Interface
-Copyright 2009 Jo-Philipp Wich <xm@leipzig.freifunk.net>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-$Id$
-
--%>
-
-<%-
-
-local utl = require "luci.util"
-local ipt = require "luci.sys.iptparser".IptParser()
-local uci = require "luci.model.uci".cursor_state()
-local wat = require "luci.tools.webadmin"
-local fs  = require "nixio.fs"
-
-local clients = { }
-local leasetime = tonumber(uci:get("luci_splash", "general", "leasetime") or 1) * 60 * 60
-local leasefile = "/tmp/dhcp.leases"
-
-uci:foreach("dhcp", "dnsmasq",
-	function(s)
-		if s.leasefile then leasefile = s.leasefile end
-	end)
-
-
-uci:foreach("luci_splash_leases", "lease",
-	function(s)
-		if s.start and s.mac then
-			clients[s.mac:lower()] = {
-				start   = tonumber(s.start),
-				limit   = ( tonumber(s.start) + leasetime ),
-				mac     = s.mac:upper(),
-				ipaddr  = s.ipaddr,
-				policy  = "normal",
-				packets = 0,
-				bytes   = 0,
-			}
-		end
-	end)
-
-for _, r in ipairs(ipt:find({table="nat", chain="luci_splash_leases"})) do
-	if r.options and #r.options >= 2 and r.options[1] == "MAC" then
-		if not clients[r.options[2]:lower()] then
-			clients[r.options[2]:lower()] = {
-				start  = 0,
-				limit  = 0,
-				mac    = r.options[2]:upper(),
-				policy = ( r.target == "RETURN" ) and "whitelist" or "blacklist",
-				packets = 0,
-				bytes   = 0
-			}
-		end
-	end
-end
-
-for mac, client in pairs(clients) do
-	client.bytes_in    = 0
-	client.bytes_out   = 0
-	client.packets_in  = 0
-	client.packets_out = 0
-
-	if client.ipaddr then
-		local rin  = ipt:find({table="mangle", chain="luci_splash_mark_in", destination=client.ipaddr})
-		local rout = ipt:find({table="mangle", chain="luci_splash_mark_out", options={"MAC", client.mac:upper()}})
-
-		if rin and #rin > 0 then
-			client.bytes_in   = rin[1].bytes
-			client.packets_in = rin[1].packets
-		end
-
-		if rout and #rout > 0 then
-			client.bytes_out   = rout[1].bytes
-			client.packets_out = rout[1].packets
-		end
-	end
-end
-
-uci:foreach("luci_splash", "whitelist",
-	function(s)
-		if s.mac and clients[s.mac:lower()] then
-			clients[s.mac:lower()].policy="whitelist"
-		end
-	end)
-
-uci:foreach("luci_splash", "blacklist",
-	function(s)
-		if s.mac and clients[s.mac:lower()] then
-			clients[s.mac:lower()].policy=(s.kicked and "kicked" or "blacklist")
-		end
-	end)		
-
-if fs.access(leasefile) then
-	for l in io.lines(leasefile) do
-		local time, mac, ip, name = l:match("^(%d+) (%S+) (%S+) (%S+)")
-		if time and mac and ip then
-			local c = clients[mac:lower()]
-			if c then
-				c.ip = ip
-				c.hostname = ( name ~= "*" ) and name or nil
-			end
-		end
-	end
-end
-
-for i, a in ipairs(luci.sys.net.arptable()) do
-	local c = clients[a["HW address"]:lower()]
-	if c and not c.ip then
-		c.ip = a["IP address"]
-	end
-end
-
-local function showmac(mac)
-	if not is_admin then
-		mac = mac:gsub("(%S%S:%S%S):%S%S:%S%S:(%S%S:%S%S)", "%1:XX:XX:%2")
-	end
-	return mac
-end
-
-if luci.http.formvalue("status") == "1" then
-	local rv = {}
-	for _, c in utl.spairs(clients,
-		function(a,b) if clients[a].policy == clients[b].policy then
-			return (clients[a].start > clients[b].start)
-		else
-			return (clients[a].policy > clients[b].policy)
-		end
-	end)
-	do
-		if c.ip then
-			rv[#rv+1] = {
-				hostname = c.hostname or "?",
-				ip = c.ip or "?",
-				mac = showmac(c.mac) or "?",
-				timeleft = (c.limit >= os.time()) and wat.date_format(c.limit-os.time()) or (c.policy ~= "normal") and "-" or "expired",
-				trafficin = wat.byte_format(c.bytes_in) or "?",
-				trafficout = wat.byte_format(c.bytes_out) or "?",
-				policy = c.policy or "?"
-	                        }
-		end
-	end
-	luci.http.prepare_content("application/json")
-	luci.http.write_json(rv)
-	return
-end
--%>
-
-
-
-<%+header%>
-
-<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
-<script type="text/javascript">//<![CDATA[
-
-	XHR.poll(10 , '<%=REQUEST_URI%>', { status: 1 },
-		function(x, info)
-		{
-		var tbody = document.getElementById('splash_table');
-			if (tbody)
-			{
-				var s = '';
-				if (info.length == undefined) {
-					s += '<tr class="cbi-section-table-row"><td colspan="7" class="cbi-section-table-cell"><br /><em><%:No clients connected%></em><br /></td></tr>'
-				};
-				for (var idx = 0; idx < info.length; idx++)
-				{
-					var splash = info[idx];
-					s += String.format(
-						'<tr class="cbi-section-table-row cbi-rowstyle-'+(1 + (idx % 2))+'">' +
-						'<td class="cbi-section-table-cell">%s</td>' +
-						'<td class="cbi-section-table-cell">%s</td>' +
-						'<td class="cbi-section-table-cell">%s</td>' +
-						'<td class="cbi-section-table-cell">%s</td>' +
-						'<td class="cbi-section-table-cell">%s/%s</td>' +
-						'<td class="cbi-section-table-cell">',
-						splash.hostname, splash.ip, splash.mac, splash.timeleft, splash.trafficin, splash.trafficout);
-
-				<% if is_admin then %>
-					s += String.format('<select name="policy.%s" style="width:200px">', splash.mac.toLowerCase());
-					if (splash.policy == 'whitelist') { 	
-						s += '<option value="whitelist" selected="selected"><%:whitelisted%></option>'
-					} else {
-						s += '<option value="whitelist"><%:whitelisted%></option>'
-					};
-					if (splash.policy == 'normal') {
-						s += '<option value="normal" selected="selected"><%:splashed%></option>';
-						s += '<option value="kicked"><%:temporarily blocked%></option>'
-					} else {
-						s += '<option value="normal"><%:splashed%></option>'
-					};
-					if (splash.policy == 'blacklist') {
-						s+= '<option value="blacklist" selected="selected"><%:blacklisted%></option>'
-					} else {
-						s += '<option value="blacklist"><%:blacklisted%></option>'
-					};
-					s += String.format(
-						'</select>' +
-						'<input type="submit" class="cbi-button cbi-button-save" name="save.%s" value="<%:Save%>" />',
-						splash.mac.toLowerCase());
-				<% else %>
-					s += String.format('%s', splash.policy);
-				<% end %>
-					s += '</td></tr>'
-				}
-				tbody.innerHTML = s;
-			}
-		}
-	);
-//]]></script>
-
-
-<div id="cbi-splash-leases" class="cbi-map">
-	<h2><a id="content" name="content"><%:Client-Splash%></a></h2>
-	<fieldset id="cbi-table-table" class="cbi-section">
-		<legend><%:Active Clients%></legend>
-		<div class="cbi-section-node">
-			<% if is_admin then %><form action="<%=REQUEST_URI%>" method="post"><% end %>
-			<table class="cbi-section-table">
-				<thead>
-					<tr class="cbi-section-table-titles">
-						<th class="cbi-section-table-cell"><%:Hostname%></th>
-						<th class="cbi-section-table-cell"><%:IP Address%></th>
-						<th class="cbi-section-table-cell"><%:MAC Address%></th>
-						<th class="cbi-section-table-cell"><%:Time remaining%></th>
-						<th class="cbi-section-table-cell"><%:Traffic in/out%></th>
-						<th class="cbi-section-table-cell"><%:Policy%></th>
-					</tr>
-				</thead>
-				<tbody id="splash_table">
-
-				<%-
-					local count = 0
-					for _, c in utl.spairs(clients,
-						function(a,b)
-							if clients[a].policy == clients[b].policy then
-								return (clients[a].start > clients[b].start)
-							else
-								return (clients[a].policy > clients[b].policy)
-							end
-						end)
-					do
-						if c.ip then
-							count = count + 1
-				-%>
-						<tr class="cbi-section-table-row cbi-rowstyle-<%=2-(count%2)%>">
-						<td class="cbi-section-table-cell"><%=c.hostname or "<em>" .. translate("unknown") .. "</em>"%></td>
-						<td class="cbi-section-table-cell"><%=c.ip or "<em>" .. translate("unknown") .. "</em>"%></td>
-						<td class="cbi-section-table-cell"><%=showmac(c.mac)%></td>
-						<td class="cbi-section-table-cell"><%=
-							(c.limit >= os.time()) and wat.date_format(c.limit-os.time()) or
-								(c.policy ~= "normal") and "-" or "<em>" .. translate("expired") .. "</em>"
-						%></td>
-						<td class="cbi-section-table-cell"><%=wat.byte_format(c.bytes_in)%> / <%=wat.byte_format(c.bytes_out)%></td>
-						<td class="cbi-section-table-cell">
-							<% if is_admin then %>
-							<select name="policy.<%=c.mac:lower()%>" style="width:200px">
-								<option value="whitelist"<%=c.policy=="whitelist" and ' selected="selected"'%>><%:whitelisted%></option>
-								<option value="normal"<%=c.policy=="normal" and not c.kicked and ' selected="selected"'%>><%:splashed%></option>
-								<option value="blacklist"<%=c.policy=="blacklist" and ' selected="selected"'%>><%:blacklisted%></option>
-								<% if c.policy == "normal" then -%>
-									<option value="kicked"><%:temporarily blocked%></option>
-								<%- end %>
-							</select>
-							<input type="submit" class="cbi-button cbi-button-save" name="save.<%=c.mac:lower()%>" value="<%:Save%>" />
-							<% else %>
-							<%=c.policy%>
-							<% end %>
-						</td>
-						</tr>
-						<%- 
-							end
-						end
-						if count == 0 then
-						-%>
-						<tr class="cbi-section-table-row">
-							<td colspan="7" class="cbi-section-table-cell">
-								<br /><em><%:No clients connected%></em><br />
-							</td>
-						</tr>
-				<%- end -%>
-				</tbody>
-			</table>
-			<% if is_admin then %></form><% end %>
-		</div>
-	</fieldset>
-</div>
-
-<%+footer%>
diff --git a/applications/luci-splash/luasrc/view/splash/blocked.htm b/applications/luci-splash/luasrc/view/splash/blocked.htm
deleted file mode 100644
index de61ecf011..0000000000
--- a/applications/luci-splash/luasrc/view/splash/blocked.htm
+++ /dev/null
@@ -1,25 +0,0 @@
-<%#
-LuCI - Lua Configuration Interface
-Copyright 2011 Manuel Munz <freifunk at somakoma dot de>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
--%>
-<%
-local contacturl = luci.dispatcher.build_url("freifunk", "contact")
-%>
-
-<%+header%>
-
-<h2><a id="content" name="content"><%:Blocked%></a></h2>
-
-<p><%:Your access to this network has been blocked, most likely because you did something that our rules explicitly forbid.%></p>
-<p><%:To ask for the reason why you have been blocked or ask for access again you can try to contact the owner of this access point:%> <a href="<%=contacturl%>"><%:Contact%></a></p>
-
-<%+footer%>
-
-
-
diff --git a/applications/luci-splash/luasrc/view/splash/splash.htm b/applications/luci-splash/luasrc/view/splash/splash.htm
deleted file mode 100644
index 2ebee273b4..0000000000
--- a/applications/luci-splash/luasrc/view/splash/splash.htm
+++ /dev/null
@@ -1,139 +0,0 @@
-<%#
-LuCI - Lua Configuration Interface
-Copyright 2008 Steven Barth <steven@midlink.org>
-Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
-Copyright 2011 Manuel Munz <freifunk at somakoma dot de>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
--%>
-<%
-local fs = require "luci.fs"
-local has_custom_splash = fs.access("/usr/lib/luci-splash/splashtext.html")
-local has_custom_splashinclude = fs.access("/usr/lib/luci-splash/splashtextinclude.html")
-
-function expand (e, R)        
-	return (string.gsub(e, "###([A-Z_]+)###", R))
-end
-
-local community, homepage, leasetime, limit_up, limit_down
-
-local contacturl = luci.dispatcher.build_url("freifunk", "contact")
-
-local c = luci.model.uci.cursor():get_all("freifunk", "community")
-if c and c.name then
-        name = luci.model.uci.cursor():get('profile_' .. c.name, 'profile', 'name')
-	if name then
-		community = name
-	else
-		community = c.name
-	end
-else
-	community = "Freifunk"
-end
-
-if c and c.homepage then
-	homepage = c.homepage
-else
-	homepage = "http://freifunk.net"
-end
-
-local s = luci.model.uci.cursor():get_all("luci_splash", "general")
-if s then
-	leasetime = s.leasetime or ""
-	limit_up = s.limit_up or nil
-	limit_down = s.limit_down or nil
-end
-
-local limit_text = ""
-if limit_up and limit_down then
-	limit_text = "<p>" .. translate("Your bandwidth is limited to") .. " " .. limit_down .. "/" .. limit_up ..
-	" " .. translate("KB/s (Download/Upload). You may be able to remove this limit by actively contributing " ..
-	"to this project.") .. "</p>"
-end
-
-local contact = translate('Get in %s with the operator of this access point.')
-contact = contact % ('<a href="' .. contacturl .. '">' .. translatef('Contact') .. '</a>')
-
-local accepttext = translate('By accepting these rules you can use this network for %s hour(s). After this time you need to accept these rules again.')
-accepttext = accepttext % leasetime
-
-
-if has_custom_splash then
-	local R = {
-		COMMUNITY = community,
-		COMMUNITY_URL = homepage,
-		LEASETIME = leasetime,
-		ACCEPT = tostring(translate("Accept")),
-		LIMIT = limit_text,
-		CONTACTURL = contacturl
-	}
-	local splashtext = expand(fs.readfile("/usr/lib/luci-splash/splashtext.html"), R)
-	%>
-	<%=splashtext%>
-
-<% else %>
-
-	<h2><a id="content" name="content"><%:Welcome%></a></h2>
-
-	<p><%:You are now connected to the free wireless mesh network%> <a href="<%=homepage%>"><%=community%></a>.
-	<%:Please note that we are not an internet service provider but an experimental community network.%></p>
-	<p><%:Access to the internet might be possible nevertheless, because some activists of this project share their
-	private	internet connections. These few connections are shared between all users. That means available bandwidth
-	is limited and because of this we ask you not to do any of the following:%></p>
-	<ul>
-		<li><%:use filesharing applications on this network%></li>
-		<li><%:waste bandwidth with unneccesary downloads or streams%></li>
-		<li><%:perform any kind of illegal activities%></li>
-	</ul>
-	<br />
-
-	<% if limit_up and limit_down then %>
-		<%=limit_text%>
-	<% end %>
-	
-	<p><%:If you use this network on a regular basis we ask for your support:%></p>
-	<ul>
-		<li><a href="<%=homepage%>"><%:Become an active member of this community and help by operating your own node%></a></li>
-		<li><%=contact%></li>
-		<li><%:Donate some money to help us keep this project alive.%></li>
-		<li><%:If you operate your own wifi equipment use channels different from ours.%></li>
-	</ul>
-
-	<%
-	if has_custom_splashinclude then
-		local splashtextinclude = fs.readfile("/usr/lib/luci-splash/splashtextinclude.html")
-	%>
-		<%=splashtextinclude%>
-	<% end %>
-
-	<h2><%:Usage Agreement%></h2>
-	<p>
-	<%:The open and free wireless network of volunteers ("Operators") provides the necessary equipment and Internet connections ("Infrastructure") at their own expense.%>
-	<%:These Terms of Use govern the use of the network by its participants' computer, PDA, or similar device ("Devices") within the network.%>
-	<%:Access to the network is not guaranteed. It can be interrupted at any time without notice for any reason, for certain devices, and/or may be blocked for certain users.%>
-	</p>
-
-	<h3><%:Legally Prohibited Activities%></h3>
-	<p><%:The participant agrees to not perform any action and refrain from acts which may violate the law or infringe upon the rights of third parties.%></p>
- 
-	<h3><%:Legally Prohibited content%></h3>
-	<p><%:The participant agrees to not transfer content over the network which violates the law.%></p>
- 
-	<h3><%:Fair Use Policy%></h3>
-	<p><%:The participant agrees to not use the network in any way which will harm the infrastructure, the network itself, its operators or other participants.%></p>
- 
-	<h3><%:Safety%></h3>
-	<p><%:The network, like the Internet, is unencrypted and open. Each participant is responsible for the safety of their own connections and devices.%></p>
- 
-	<h3>Disclaimer</h3>
-	<p><%:The operator claims no liability for loss of data, unauthorized access/damage to devices, or financial losses that participants may suffer from the use of the network.%></p>
-
-	<br /><p><b><%=accepttext%></b></p>
-<% end %>
-
-
-
diff --git a/applications/luci-splash/luasrc/view/splash_splash/index.htm b/applications/luci-splash/luasrc/view/splash_splash/index.htm
deleted file mode 100644
index ab754913d3..0000000000
--- a/applications/luci-splash/luasrc/view/splash_splash/index.htm
+++ /dev/null
@@ -1,16 +0,0 @@
-<%#
-LuCI - Lua Configuration Interface
-Copyright 2008 Steven Barth <steven@midlink.org>
-Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-$Id$
-
--%>
-<%+header%>
-<%+footer%>
\ No newline at end of file
diff --git a/applications/luci-splash/luasrc/view/splash_splash/splash.htm b/applications/luci-splash/luasrc/view/splash_splash/splash.htm
deleted file mode 100644
index 8554913cd8..0000000000
--- a/applications/luci-splash/luasrc/view/splash_splash/splash.htm
+++ /dev/null
@@ -1,25 +0,0 @@
-<%#
-LuCI - Lua Configuration Interface
-Copyright 2008 Steven Barth <steven@midlink.org>
-Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-$Id$
-
--%>
-<%+header%>
-<%+splash/splash%>
-
-<form method="get" action="<%=controller%>/splash/activate">
-	<p>
-		<input type="submit" value="<%:Decline%>" />
-		<input type="submit" name="accept" value="<%:Accept%>" />
-	</p>
-</form>
-
-<%+footer%>