* core: Fixed a bug in the dispatcher

* core: Move cbi.js to general resource directory
* core: Removed Freifunk references
* core: Updated Fledermaus theme

6 files changed, 84 insertions, 35 deletions

diff --git a/core/root/etc/config/luci b/core/root/etc/config/luci
index ded657823..87170a9b1 100644
--- a/core/root/etc/config/luci
+++ b/core/root/etc/config/luci
@@ -1,35 +1,39 @@
 config core main
-    option lang de
-    option mediaurlbase /luci/media
-	option resourcebase /luci/images
-	option title		"Freifunk Kamikaze"
-	option subtitle		Fledermausedition
+	option lang de
+	option mediaurlbase /luci/fledermaus
+	option resourcebase /luci/resources
+	
+config core brand
+	option title		"OpenWRT Kamikaze"
+	option subtitle		Freifunkedition
+	option firmware		"OpenWRT Kamikaze"
+	option distro		"Freifunk Firmware 2.x"
 		
 config extern flash_keep
-		option uci 		"/etc/config"
-		option dropbear "/etc/dropbear"
-		option openvpn	"/etc/openvpn"
-		option passwd	"/etc/passwd"
-		option ipkg		"/etc/ipkg.conf"
-		option httpd	"/etc/httpd.conf"
-		option firewall	"/etc/firewall.user"
+	option uci 		"/etc/config"
+	option dropbear "/etc/dropbear"
+	option openvpn	"/etc/openvpn"
+	option passwd	"/etc/passwd"
+	option ipkg		"/etc/ipkg.conf"
+	option httpd	"/etc/httpd.conf"
+	option firewall	"/etc/firewall.user"
 
 config event uci_oncommit
-        option network	"/etc/init.d/network restart"
-        option wireless	"/etc/init.d/network restart"
-        option olsr		"/sbin/reboot"
-        option dhcp		"/etc/init.d/dnsmasq restart"
-        option luci_fw  "/etc/init.d/luci_fw restart"
-        option dropbear "/etc/init.d/dropbear restart"
-        option httpd	"/etc/init.d/httpd restart"
-        option fstab	"/etc/init.d/fstab restart"
-        option qos		"/etc/init.d/qos restart"
-        option luci_splash "/etc/init.d/luci_splash restart"
-        option freifunk "/etc/init.d/luci_freifunk restart"
+	option network	"/etc/init.d/network restart"
+	option wireless	"/etc/init.d/network restart"
+	option olsr		"/sbin/reboot"
+	option dhcp		"/etc/init.d/dnsmasq restart"
+	option luci_fw  "/etc/init.d/luci_fw restart"
+ 	option dropbear "/etc/init.d/dropbear restart"
+ 	option httpd	"/etc/init.d/httpd restart"
+ 	option fstab	"/etc/init.d/fstab restart"
+	option qos		"/etc/init.d/qos restart"
+	option luci_splash "/etc/init.d/luci_splash restart"
+	option freifunk "/etc/init.d/luci_freifunk restart"
         
 config internal languages
-		option de "Deutsch"
-		option en "English"
+	option de "Deutsch"
+	option en "English"
 		
 config internal themes
-		option Fledermaus "/luci/media"
+	option Fledermaus "/luci/fledermaus"
diff --git a/core/root/www/resources/cbi.js b/core/root/www/resources/cbi.js
new file mode 100644
index 000000000..a3a47aa45
--- /dev/null
+++ b/core/root/www/resources/cbi.js
@@ -0,0 +1,42 @@
+var cbi_d = {};
+
+function cbi_d_add(field, target, value) {
+	if (!cbi_d[target]) {
+		cbi_d[target] = {};
+	}
+	if (!cbi_d[target][value]) {
+		cbi_d[target][value] = [];
+	}
+	cbi_d[target][value].push(field);
+}
+
+function cbi_d_update(target) {
+	if (!cbi_d[target]) {
+		return;
+	}
+	
+	for (var x in cbi_d[target]) {
+		for (var i=0; i<cbi_d[target][x].length; i++) {	
+			var y = document.getElementById(cbi_d[target][x][i])	
+			y.style.display = "none";
+		}
+	}
+	
+	var t = document.getElementById(target);
+	if (t && t.value && cbi_d[target][t.value]) {
+		for (var i=0; i<cbi_d[target][t.value].length; i++) {			
+			var y = document.getElementById(cbi_d[target][t.value][i])
+			if (!y.value) {	
+				y.style.display = "table-row";
+			} else {
+				y.style.display = "block";
+			}
+		}
+	}
+}
+
+function cbi_d_init() {
+	for (var x in cbi_d) {
+		cbi_d_update(x);
+	}
+}
\ No newline at end of file
diff --git a/core/src/dispatcher.lua b/core/src/dispatcher.lua
index daf975e9d..3e8b4d6b6 100644
--- a/core/src/dispatcher.lua
+++ b/core/src/dispatcher.lua
@@ -128,8 +128,8 @@ function createindex()
 	local suff = ".lua"
 
 	local controllers = luci.util.combine(
-		luci.fs.glob(root .. "*" .. suff),
-		luci.fs.glob(root .. "*/*" .. suff)
+		luci.fs.glob(root .. "*" .. suff) or {},
+		luci.fs.glob(root .. "*/*" .. suff) or {}
 	)
 
 	for i,c in ipairs(controllers) do
diff --git a/core/src/sys.lua b/core/src/sys.lua
index d174c8e74..0399d0e5f 100644
--- a/core/src/sys.lua
+++ b/core/src/sys.lua
@@ -28,12 +28,15 @@ module("luci.sys", package.seeall)
 require("posix")
 require("luci.bits")
 require("luci.util")
+require("luci.fs")
 
 -- Returns whether a system is bigendian
 function bigendian()
 	local fp = io.open("/bin/sh")
 	fp:seek("set", 5)
-	return (fp:read(1):byte() ~= 1)
+	local be = (fp:read(1):byte() ~= 1)
+	fp:close()
+	return be
 end
 
 -- Runs "command" and returns its output
diff --git a/core/src/view/cbi/header.htm b/core/src/view/cbi/header.htm
index a66d28fee..4229aaf0d 100644
--- a/core/src/view/cbi/header.htm
+++ b/core/src/view/cbi/header.htm
@@ -1,7 +1,7 @@
 <%+header%>
 		<form method="post" action="<%=luci.http.env.REQUEST_URI%>">
 			<div>
-				<script type="text/javascript" src="<%=media%>/cbi.js"></script>
+				<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
 				<input type="hidden" name="cbi.submit" value="1" />
 				<input type="submit" value="<%:save Speichern%>" class="hidden" />
 			</div>
diff --git a/core/src/view/header.htm b/core/src/view/header.htm
index 126eb3696..1a09ad304 100644
--- a/core/src/view/header.htm
+++ b/core/src/view/header.htm
@@ -31,16 +31,16 @@ require("luci.http").prepare_content("text/html")
 </head>
 <body>
 <div id="header">
-	<div class="headerlogo left"><img src="<%=media%>/logo.png" alt="Freifunk" /></div>
+	<div class="headerlogo left"><img src="<%=media%>/logo.png" alt="<%=luci.config.brand.title%>" /></div>
 	<div class="whitetext smalltext right">
-	OpenWRT Kamikaze<br />
-	Freifunk Firmware 2.0-dev<br />
+	<%=luci.config.brand.firmware%><br />
+	<%=luci.config.brand.distribution%><br />
 	<%:load Last%>: <%=load1%> <%=load5%> <%=load15%><br />
 	<%:hostname Hostname%>: <%=luci.sys.hostname()%> 
 	</div>
 	<div>
-		<span class="headertitle"><%~luci.main.title%></span><br />
-		<span class="whitetext bold"><%~luci.main.subtitle%></span>
+		<span class="headertitle"><%=luci.config.brand.title%></span><br />
+		<span class="whitetext bold"><%=luci.config.brand.subtitle%></span>
 	</div>
 </div>