* luci-splash: Fixes

4 files changed, 11 insertions, 6 deletions

diff --git a/module/admin-core/contrib/luci-splash b/module/admin-core/contrib/luci-splash
new file mode 100644
index 0000000000..57fa4b6092
--- /dev/null
+++ b/module/admin-core/contrib/luci-splash
@@ -0,0 +1,4 @@
+#!/bin/sh
+echo "Status: 302 Found"
+echo "Location: ffluci/public/splash$PATH_INFO"
+echo
\ No newline at end of file
diff --git a/module/admin-core/src/model/cbi/admin_network/splash.lua b/module/admin-core/src/model/cbi/admin_services/splash.lua
index 497d394ee2..d3c3f0ae79 100644
--- a/module/admin-core/src/model/cbi/admin_network/splash.lua
+++ b/module/admin-core/src/model/cbi/admin_services/splash.lua
@@ -3,6 +3,9 @@ require("ffluci.model.uci")
 
 m = Map("luci_splash", "Client-Splash", [[Client-Splash ist das Freifunk Hotspot-Authentifizierungs-System.]])
 
+s = m:section(NamedSection, "general", "core", "Allgemein")
+s:option(Value, "leasetime", "Freigabezeit", "h")
+
 s = m:section(TypedSection, "iface", "Schnittstellen")
 s.addremove = true
 s.anonymous = true
diff --git a/module/admin-core/src/model/menu/00admin.lua b/module/admin-core/src/model/menu/00admin.lua
index 42c185937d..3754a5bc8b 100644
--- a/module/admin-core/src/model/menu/00admin.lua
+++ b/module/admin-core/src/model/menu/00admin.lua
@@ -18,6 +18,9 @@ end
 act("httpd", "HTTP-Server")
 act("dropbear", "SSH-Server")
 act("dnsmasq", "Dnsmasq")
+if isfile("/etc/config/luci_splash") then
+	act("splash", "Client-Splash")
+end
 
 add("admin", "network", "Netzwerk", 50)
 act("vlan", "Switch")
@@ -27,11 +30,6 @@ act("ptp", "PPPoE / PPTP")
 act("routes", "Statische Routen")
 act("portfw", "Portweiterleitung")
 act("firewall", "Firewall")
-
-if isfile("/etc/config/luci_splash") then
-	act("splash", "Client-Splash")
-end
-
 if isfile("/etc/config/qos") then
 	act("qos", "Quality of Service")
 end
diff --git a/module/admin-core/src/view/admin_system/reboot.htm b/module/admin-core/src/view/admin_system/reboot.htm
index df855e49c3..b6c38b75c4 100644
--- a/module/admin-core/src/view/admin_system/reboot.htm
+++ b/module/admin-core/src/view/admin_system/reboot.htm
@@ -6,6 +6,6 @@
 <p><a href="<%=controller%>/admin/system/reboot?reboot=1"><%:reboot_do Neustart durchführen%></a></p>
 <% else %>
 <p><%:reboot_running Bitte warten: Neustart wird durchgeführt...%></p>
-<script type="text/javascript">setTimeout("location='<%=controller%>/admin'", 30000)</script>
+<script type="text/javascript">setTimeout("location='<%=controller%>/admin'", 45000)</script>
 <% end %>
 <%+footer%>
\ No newline at end of file