46 files changed, 2 insertions, 268 deletions
diff --git a/core/Makefile b/core/Makefile
index dbebb52d9e..5e64bcd1f0 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1,39 +1,2 @@
-LUAC = luac
-LUAC_OPTIONS = -s
-
-FILES = ffluci/debug.lua ffluci/view/*.htm ffluci/view/cbi/*.htm ffluci/i18n/*
-
-CFILES = ffluci/bits.lua ffluci/util.lua \
-ffluci/sgi/haserl.lua ffluci/sgi/webuci.lua \
-ffluci/http.lua ffluci/fs.lua ffluci/sys.lua \
-ffluci/model/uci/wrapper.lua ffluci/model/uci/libuci.lua ffluci/model/uci.lua \
-ffluci/model/ipkg.lua ffluci/config.lua ffluci/i18n.lua ffluci/template.lua \
-ffluci/cbi.lua ffluci/dispatcher.lua ffluci/menu.lua ffluci/init.lua 
-
-DIRECTORIES = ffluci/model/cbi ffluci/model/menu ffluci/controller ffluci/i18n ffluci/view/cbi ffluci/model/uci ffluci/sgi
-
-OUTDIRS = $(DIRECTORIES:%=dist/%)
-INFILES = $(CFILES:%=src/%)
-OUTFILE = ffluci/init.lua
-CPFILES = $(FILES:%=src/%)
-
-.PHONY: all compile source depends clean
-
-all: compile
-
-depends:
-	mkdir -p $(OUTDIRS)
-	for i in $(CPFILES); do if [ -f "$$i" ]; then i=$$(echo $$i | cut -d/ -f2-); \
-		mkdir -p dist/$$(dirname $$i); cp src/$$i dist/$$i; fi; done
-
-compile: depends
-	$(LUAC) $(LUAC_OPTIONS) -o dist/$(OUTFILE) $(INFILES)
-	for i in $(CFILES); do [ -f dist/$$i ] || ln -s `dirname $$i | cut -s -d / -f 2- | sed -e 's/[^/]*\/*/..\//g'``basename $(OUTFILE)` dist/$$i; done
-	
-
-source: depends
-	for i in $(CFILES); do cp src/$$i dist/$$i; done
-	
-	
-clean:
-	rm dist -rf
+include ../build/config.mk
+include ../build/module.mk
+\ No newline at end of file
diff --git a/core/contrib/ffluci b/core/contrib/ffluci
deleted file mode 100755
index 183a6ad412..0000000000
--- a/core/contrib/ffluci
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/haserl --shell=luac
-package.path  = "/usr/lib/lua/?.lua;/usr/lib/lua/?/init.lua;" .. package.path
-package.cpath = "/usr/lib/lua/?.so;" .. package.cpath
-require("ffluci.dispatcher").httpdispatch()
-\ No newline at end of file
diff --git a/core/contrib/ffluci-upload b/core/contrib/ffluci-upload
deleted file mode 100755
index 0128c2dd73..0000000000
--- a/core/contrib/ffluci-upload
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/haserl --shell=luac --upload-limit=6144
--- This is a bit hacky: remove -upload from SCRIPT_NAME
-ENV.SCRIPT_NAME = ENV.SCRIPT_NAME:sub(1, #ENV.SCRIPT_NAME - 7)
-dofile("ffluci")
-\ No newline at end of file
diff --git a/core/contrib/index.cgi b/core/contrib/index.cgi
deleted file mode 100755
index 31705ccf27..0000000000
--- a/core/contrib/index.cgi
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/haserl --shell=luac
-print("Status: 302 Found")
-print("Location: ffluci\n")
diff --git a/core/contrib/index.html b/core/contrib/index.html
deleted file mode 100644
index 58387a5fec..0000000000
--- a/core/contrib/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="refresh" content="0; URL=/cgi-bin/index.cgi" />
-</head>
-<body style="background-color: black">
-<a style="color: white; text-decoration: none" href="/cgi-bin/index.cgi">FFLuCI - Freifunk Lua Configuration Interface</a>
-</body>
-</html>
-\ No newline at end of file
diff --git a/core/contrib/uci/freifunk b/core/contrib/uci/freifunk
deleted file mode 100644
index aba12e6367..0000000000
--- a/core/contrib/uci/freifunk
+++ /dev/null
@@ -1,26 +0,0 @@
-config public contact
-		option nickname
-		option name
-		option mail
-		option phone
-		option location
-		option geo
-		option note
-		
-config public community
-		option name		"Freifunk Halle"
-		option homepage http://halle.freifunk.net
-		option essid	halle.freifunk.net
-		option bssid	02:CA:FF:EE:BA:BE
-		option realm	netz.freifunk-halle.net
-		option channel	1
-		option net		104.0.0.0
-		option mask		255.0.0.0
-		option dhcp		10.0.0.0
-		option dhcpmask 255.255.255.0
-		option dns		"88.198.178.18 141.54.1.1 212.204.49.83 208.67.220.220 208.67.222.222"
-		
-config settings routing
-		option internal	0
-		option internet	0
-		
-\ No newline at end of file
diff --git a/core/contrib/webuci_bootstrap.lua b/core/contrib/webuci_bootstrap.lua
deleted file mode 100644
index 50ac8184b7..0000000000
--- a/core/contrib/webuci_bootstrap.lua
+++ /dev/null
@@ -1,23 +0,0 @@
-package.path  = "/usr/lib/lua/?.lua;/usr/lib/lua/?/init.lua;" .. package.path
-package.cpath = "/usr/lib/lua/?.so;" .. package.cpath
-module("webuci", package.seeall)
-
-function prepare_req(uri)
-	env = {}
-	env.REQUEST_URI = uri
-	require("ffluci.menu").get()
-end
-
-function init_req(context)
-	env.SERVER_PROTOCOL = context.server_proto
-	env.REMOTE_ADDR     = context.remote_addr
-	env.REQUEST_METHOD  = context.request_method
-	env.PATH_INFO       = "/" .. context.uri
-	env.REMOTE_PORT     = context.remote_port
-	env.SERVER_ADDR     = context.server_addr
-	env.SCRIPT_NAME     = env.REQUEST_URI:sub(1, #env.REQUEST_URI - #env.PATH_INFO)
-end
-
-function handle_req(context)
-	require("ffluci.dispatcher").httpdispatch()
-end
-\ No newline at end of file
diff --git a/core/contrib/uci/luci b/core/root/etc/config/luci
index a2b61f483a..a2b61f483a 100644
--- a/core/contrib/uci/luci
+++ b/core/root/etc/config/luci
diff --git a/core/src/ffluci/bits.lua b/core/src/bits.lua
index f8434c335d..f8434c335d 100644
--- a/core/src/ffluci/bits.lua
+++ b/core/src/bits.lua
diff --git a/core/src/ffluci/cbi.lua b/core/src/cbi.lua
index 3384e5c38a..3384e5c38a 100644
--- a/core/src/ffluci/cbi.lua
+++ b/core/src/cbi.lua
diff --git a/core/src/ffluci/config.lua b/core/src/config.lua
index 0db45ac891..0db45ac891 100644
--- a/core/src/ffluci/config.lua
+++ b/core/src/config.lua
diff --git a/core/src/ffluci/debug.lua b/core/src/debug.lua
index 1be40348e4..1be40348e4 100644
--- a/core/src/ffluci/debug.lua
+++ b/core/src/debug.lua
diff --git a/core/src/ffluci/dispatcher.lua b/core/src/dispatcher.lua
index c60e5dcd17..c60e5dcd17 100644
--- a/core/src/ffluci/dispatcher.lua
+++ b/core/src/dispatcher.lua
diff --git a/core/src/ffluci/sgi/haserl.lua b/core/src/ffluci/sgi/haserl.lua
deleted file mode 100644
index 7e9854d7d3..0000000000
--- a/core/src/ffluci/sgi/haserl.lua
+++ /dev/null
@@ -1,76 +0,0 @@
---[[
-FFLuCI - SGI-Module for Haserl
-
-Description:
-Server Gateway Interface for Haserl
-
-FileId:
-$Id$
-
-License:
-Copyright 2008 Steven Barth <steven@midlink.org>
-
-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 
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-]]--
-module("ffluci.sgi.haserl", package.seeall)
-
--- Environment Table
-ffluci.http.env = ENV
-
-
--- Returns a table of all COOKIE, GET and POST Parameters
-function ffluci.http.formvalues()
-	return FORM
-end
-
--- Gets form value from key
-function ffluci.http.formvalue(key, default)
-	local c = ffluci.http.formvalues()
-	
-	for match in key:gmatch("[%w-_]+") do
-		c = c[match]
-		if c == nil then
-			return default
-		end
-	end
-	
-	return c
-end
-
--- Gets a table of values with a certain prefix
-function ffluci.http.formvaluetable(prefix)
-	return ffluci.http.formvalue(prefix, {})
-end
-
--- Sends a custom HTTP-Header
-function ffluci.http.header(key, value)
-	print(key .. ": " .. value)
-end
-
--- Set Content-Type
-function ffluci.http.prepare_content(type)
-	print("Content-Type: "..type.."\n")
-end
-
--- Asks the browser to redirect to "url"
-function ffluci.http.redirect(url)
-	ffluci.http.status(302, "Found")
-	ffluci.http.header("Location", url)
-	print()
-end
-
--- Sets HTTP-Status-Header
-function ffluci.http.status(code, message)
-	print("Status: " .. tostring(code) .. " " .. message)
-end
diff --git a/core/src/ffluci/sgi/webuci.lua b/core/src/ffluci/sgi/webuci.lua
deleted file mode 100644
index 5e17ab7935..0000000000
--- a/core/src/ffluci/sgi/webuci.lua
+++ /dev/null
@@ -1,83 +0,0 @@
---[[
-FFLuCI - SGI-Module for Haserl
-
-Description:
-Server Gateway Interface for Haserl
-
-FileId:
-$Id$
-
-License:
-Copyright 2008 Steven Barth <steven@midlink.org>
-
-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 
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-]]--
-module("ffluci.sgi.webuci", package.seeall)
-
--- Environment Table
-ffluci.http.env = webuci.env
-
-
-local status_set = false
-
--- Returns a table of all COOKIE, GET and POST Parameters
-function ffluci.http.formvalues()
-	return webuci.vars
-end
-
--- Gets form value from key
-function ffluci.http.formvalue(key, default)
-	return ffluci.http.formvalues()[key] or default
-end
-
--- Gets a table of values with a certain prefix
-function ffluci.http.formvaluetable(prefix)
-	local vals = {}
-	prefix = prefix and prefix .. "." or "."
-	
-	for k, v in pairs(ffluci.http.formvalues()) do
-		if k:find(prefix, 1, true) == 1 then
-			vals[k:sub(#prefix + 1)] = v
-		end
-	end
-	
-	return vals
-end
-
--- Sends a custom HTTP-Header
-function ffluci.http.header(key, value)
-	print(key .. ": " .. value)
-end
-
--- Set Content-Type
-function ffluci.http.prepare_content(type)
-	if not status_set then
-		ffluci.http.status(200, "OK")
-	end
-	
-	print("Content-Type: "..type.."\n")
-end
-
--- Asks the browser to redirect to "url"
-function ffluci.http.redirect(url)
-	ffluci.http.status(302, "Found")
-	ffluci.http.header("Location", url)
-	print()
-end
-
--- Sets HTTP-Status-Header
-function ffluci.http.status(code, message)
-	print(webuci.env.SERVER_PROTOCOL .. " " .. tostring(code) .. " " .. message)
-	status_set = true
-end
diff --git a/core/src/ffluci/fs.lua b/core/src/fs.lua
index 0ca191be94..0ca191be94 100644
--- a/core/src/ffluci/fs.lua
+++ b/core/src/fs.lua
diff --git a/core/src/ffluci/http.lua b/core/src/http.lua
index f4ba570946..f4ba570946 100644
--- a/core/src/ffluci/http.lua
+++ b/core/src/http.lua
diff --git a/core/src/ffluci/i18n.lua b/core/src/i18n.lua
index 88381dde7f..88381dde7f 100644
--- a/core/src/ffluci/i18n.lua
+++ b/core/src/i18n.lua
diff --git a/core/src/ffluci/i18n/cbi.en b/core/src/i18n/cbi.en
index 6069cec453..6069cec453 100644
--- a/core/src/ffluci/i18n/cbi.en
+++ b/core/src/i18n/cbi.en
diff --git a/core/src/ffluci/i18n/default.en b/core/src/i18n/default.en
index 726095ae76..726095ae76 100644
--- a/core/src/ffluci/i18n/default.en
+++ b/core/src/i18n/default.en
diff --git a/core/src/ffluci/init.lua b/core/src/init.lua
index 8d4cea2e96..8d4cea2e96 100644
--- a/core/src/ffluci/init.lua
+++ b/core/src/init.lua
diff --git a/core/src/ffluci/menu.lua b/core/src/menu.lua
index 5724b2cb9e..5724b2cb9e 100644
--- a/core/src/ffluci/menu.lua
+++ b/core/src/menu.lua
diff --git a/core/src/ffluci/model/ipkg.lua b/core/src/model/ipkg.lua
index 3b149fb168..3b149fb168 100644
--- a/core/src/ffluci/model/ipkg.lua
+++ b/core/src/model/ipkg.lua
diff --git a/core/src/ffluci/model/uci.lua b/core/src/model/uci.lua
index ca5b232eb3..ca5b232eb3 100644
--- a/core/src/ffluci/model/uci.lua
+++ b/core/src/model/uci.lua
diff --git a/core/src/ffluci/model/uci/libuci.lua b/core/src/model/uci/libuci.lua
index b160dc10a3..b160dc10a3 100644
--- a/core/src/ffluci/model/uci/libuci.lua
+++ b/core/src/model/uci/libuci.lua
diff --git a/core/src/ffluci/model/uci/wrapper.lua b/core/src/model/uci/wrapper.lua
index 3aa3b5fd1d..3aa3b5fd1d 100644
--- a/core/src/ffluci/model/uci/wrapper.lua
+++ b/core/src/model/uci/wrapper.lua
diff --git a/core/src/ffluci/sys.lua b/core/src/sys.lua
index 3766548932..3766548932 100644
--- a/core/src/ffluci/sys.lua
+++ b/core/src/sys.lua
diff --git a/core/src/ffluci/template.lua b/core/src/template.lua
index 7ac47cbbef..7ac47cbbef 100644
--- a/core/src/ffluci/template.lua
+++ b/core/src/template.lua
diff --git a/core/src/ffluci/util.lua b/core/src/util.lua
index 9e3c7f25e9..9e3c7f25e9 100644
--- a/core/src/ffluci/util.lua
+++ b/core/src/util.lua
diff --git a/core/src/ffluci/view/cbi/dvalue.htm b/core/src/view/cbi/dvalue.htm
index f54667def6..f54667def6 100644
--- a/core/src/ffluci/view/cbi/dvalue.htm
+++ b/core/src/view/cbi/dvalue.htm
diff --git a/core/src/ffluci/view/cbi/footer.htm b/core/src/view/cbi/footer.htm
index 2acf710cdd..2acf710cdd 100644
--- a/core/src/ffluci/view/cbi/footer.htm
+++ b/core/src/view/cbi/footer.htm
diff --git a/core/src/ffluci/view/cbi/fvalue.htm b/core/src/view/cbi/fvalue.htm
index b609f1d4f4..b609f1d4f4 100644
--- a/core/src/ffluci/view/cbi/fvalue.htm
+++ b/core/src/view/cbi/fvalue.htm
diff --git a/core/src/ffluci/view/cbi/header.htm b/core/src/view/cbi/header.htm
index 3b615d7294..3b615d7294 100644
--- a/core/src/ffluci/view/cbi/header.htm
+++ b/core/src/view/cbi/header.htm
diff --git a/core/src/ffluci/view/cbi/lvalue.htm b/core/src/view/cbi/lvalue.htm
index f1ae5a0939..f1ae5a0939 100644
--- a/core/src/ffluci/view/cbi/lvalue.htm
+++ b/core/src/view/cbi/lvalue.htm
diff --git a/core/src/ffluci/view/cbi/map.htm b/core/src/view/cbi/map.htm
index 835393c1c5..835393c1c5 100644
--- a/core/src/ffluci/view/cbi/map.htm
+++ b/core/src/view/cbi/map.htm
diff --git a/core/src/ffluci/view/cbi/mvalue.htm b/core/src/view/cbi/mvalue.htm
index 97a1c4295a..97a1c4295a 100644
--- a/core/src/ffluci/view/cbi/mvalue.htm
+++ b/core/src/view/cbi/mvalue.htm
diff --git a/core/src/ffluci/view/cbi/nsection.htm b/core/src/view/cbi/nsection.htm
index bbc87f1858..bbc87f1858 100644
--- a/core/src/ffluci/view/cbi/nsection.htm
+++ b/core/src/view/cbi/nsection.htm
diff --git a/core/src/ffluci/view/cbi/tsection.htm b/core/src/view/cbi/tsection.htm
index 666c14b2e6..666c14b2e6 100644
--- a/core/src/ffluci/view/cbi/tsection.htm
+++ b/core/src/view/cbi/tsection.htm
diff --git a/core/src/ffluci/view/cbi/ucisection.htm b/core/src/view/cbi/ucisection.htm
index a1fb39cf45..a1fb39cf45 100644
--- a/core/src/ffluci/view/cbi/ucisection.htm
+++ b/core/src/view/cbi/ucisection.htm
diff --git a/core/src/ffluci/view/cbi/value.htm b/core/src/view/cbi/value.htm
index 31bf38f77c..31bf38f77c 100644
--- a/core/src/ffluci/view/cbi/value.htm
+++ b/core/src/view/cbi/value.htm
diff --git a/core/src/ffluci/view/cbi/valuefooter.htm b/core/src/view/cbi/valuefooter.htm
index 6151a3a66a..6151a3a66a 100644
--- a/core/src/ffluci/view/cbi/valuefooter.htm
+++ b/core/src/view/cbi/valuefooter.htm
diff --git a/core/src/ffluci/view/cbi/valueheader.htm b/core/src/view/cbi/valueheader.htm
index 062efa2ddd..062efa2ddd 100644
--- a/core/src/ffluci/view/cbi/valueheader.htm
+++ b/core/src/view/cbi/valueheader.htm
diff --git a/core/src/ffluci/view/error404.htm b/core/src/view/error404.htm
index 51ea176d6e..51ea176d6e 100644
--- a/core/src/ffluci/view/error404.htm
+++ b/core/src/view/error404.htm
diff --git a/core/src/ffluci/view/error500.htm b/core/src/view/error500.htm
index 8af22e8f20..8af22e8f20 100644
--- a/core/src/ffluci/view/error500.htm
+++ b/core/src/view/error500.htm
diff --git a/core/src/ffluci/view/footer.htm b/core/src/view/footer.htm
index 67856771b4..67856771b4 100644
--- a/core/src/ffluci/view/footer.htm
+++ b/core/src/view/footer.htm
diff --git a/core/src/ffluci/view/header.htm b/core/src/view/header.htm
index bc65e3e891..bc65e3e891 100644
--- a/core/src/ffluci/view/header.htm
+++ b/core/src/view/header.htm