Changeset 6918

Timestamp:

02/19/11 16:54:16 (2 years ago)

Author:

soma

Message:

modules/freifunk: Change default netmask to 255.255.0.0, change non-working dns, show error when user tries to edit profiles but there is no profile set yet

Location:

luci/trunk/modules/freifunk

Files:

• luasrc/controller/freifunk/freifunk.lua (modified) (1 diff)
• luasrc/model/cbi/freifunk/profile.lua (modified) (1 diff)
• luasrc/model/cbi/freifunk/profile_expert.lua (modified) (1 diff)
• luasrc/view/freifunk/profile_error.htm (added)
• root/etc/config/freifunk (modified) (1 diff)
• root/etc/config/profile_aachen (modified) (1 diff)
• root/etc/config/profile_bergischesland (modified) (1 diff)
• root/etc/config/profile_berlin (modified) (1 diff)
• root/etc/config/profile_duesseldorf (modified) (1 diff)
• root/etc/config/profile_hannover (modified) (1 diff)
• root/etc/config/profile_kiberpipa (modified) (1 diff)
• root/etc/config/profile_mainz (modified) (1 diff)
• root/etc/config/profile_marburg (modified) (1 diff)
• root/etc/config/profile_neuss (modified) (1 diff)
• root/etc/config/profile_openwireless_bern (modified) (1 diff)
• root/etc/config/profile_potsdam (modified) (1 diff)
• root/etc/config/profile_rosbach (modified) (1 diff)
• root/etc/config/profile_seefeld (modified) (1 diff)
• root/etc/config/profile_wlanljubljana (modified) (1 diff)

luci/trunk/modules/freifunk/luasrc/controller/freifunk/freifunk.lua

@@ -99 +99 @@
     entry({"freifunk", "map"}, template("freifunk-map/frame"), i18n("Map"), 50)
     entry({"freifunk", "map", "content"}, template("freifunk-map/map"), nil, 51)
+    entry({"admin", "freifunk", "profile_error"}, template("freifunk/profile_error"))
 end
 

luci/trunk/modules/freifunk/luasrc/model/cbi/freifunk/profile.lua

@@ -12 +12 @@
 
 local uci = require "luci.model.uci".cursor()
-local community = "profile_" .. uci:get("freifunk", "community", "name")
---local community = "profile_augsburg"
+local community = uci:get("freifunk", "community", "name")
 
+if community == nil then
+    luci.http.redirect(luci.dispatcher.build_url("admin", "freifunk", "profile_error"))
+    return
+else
+    community = "profile_" .. community
+    m = Map(community, translate("Community settings"), translate("These are the settings of your local community."))
+    c = m:section(NamedSection, "profile", "community")
 
-m = Map(community, translate("Community settings"), translate("These are the settings of your local community."))
+    name = c:option(Value, "name", "Name")
+    name.rmempty = false
 
-c = m:section(NamedSection, "profile", "community")
+    homepage = c:option(Value, "homepage", translate("Homepage"))
 
-name = c:option(Value, "name", "Name")
-name.rmempty = false
+    cc = c:option(Value, "country", translate("Country code"))
+    function cc.cfgvalue(self, section)
+        return uci:get(community, "wifi_device", "country")
+    end
+    function cc.write(self, sec, value)
+        if value then
+            uci:set(community, "wifi_device", "country", value)
+            uci:save(community)
+        end
+    end
 
-homepage = c:option(Value, "homepage", translate("Homepage"))
+    ssid = c:option(Value, "ssid", translate("ESSID"))
+    ssid.rmempty = false
 
-cc = c:option(Value, "country", translate("Country code"))
-function cc.cfgvalue(self, section)
-    return uci:get(community, "wifi_device", "country")
+    prefix = c:option(Value, "mesh_network", translate("Mesh prefix"))
+    prefix.rmempty = false
+
+    splash_net = c:option(Value, "splash_network", translate("Network for client DHCP addresses"))
+    splash_net.rmempty = false
+
+    splash_prefix = c:option(Value, "splash_prefix", translate("Client network size"))
+    splash_prefix.rmempty = false
+
+    lat = c:option(Value, "latitude", translate("Latitude"))
+    lat.rmempty = false
+
+    lon = c:option(Value, "longitude", translate("Longitude"))
+    lon.rmempty = false
+    return m
 end
-function cc.write(self, sec, value)
-    if value then
-        uci:set(community, "wifi_device", "country", value)
-        uci:save(community)
-    end
-end
-
-ssid = c:option(Value, "ssid", translate("ESSID"))
-ssid.rmempty = false
-
-prefix = c:option(Value, "mesh_network", translate("Mesh prefix"))
-prefix.rmempty = false
-
-splash_net = c:option(Value, "splash_network", translate("Network for client DHCP addresses"))
-splash_net.rmempty = false
-
-splash_prefix = c:option(Value, "splash_prefix", translate("Client network size"))
-splash_prefix.rmempty = false
-
-lat = c:option(Value, "latitude", translate("Latitude"))
-lat.rmempty = false
-
-lon = c:option(Value, "longitude", translate("Longitude"))
-lon.rmempty = false
-return m

luci/trunk/modules/freifunk/luasrc/model/cbi/freifunk/profile_expert.lua

@@ -13 +13 @@
 local fs = require "nixio.fs"
 local uci = require "luci.model.uci".cursor()
-local community = "/etc/config/profile_" .. uci:get("freifunk", "community", "name")
+local community = uci:get("freifunk", "community", "name")
 
-f = SimpleForm("community", translate("Community profile"), 
-    translate("You can manually edit the selected community profile here."))
+if community == nil then
+        luci.http.redirect(luci.dispatcher.build_url("admin", "freifunk", "profile_error"))
+        return
+else
+        community = "/etc/config/profile_" .. community
+    f = SimpleForm("community", translate("Community profile"), translate("You can manually edit the selected community profile here."))
 
-t = f:field(TextValue, "cop")
-t.rmempty = true
-t.rows = 30
-function t.cfgvalue()
-    return fs.readfile(community) or ""
+    t = f:field(TextValue, "cop")
+    t.rmempty = true
+    t.rows = 30
+    function t.cfgvalue()
+        return fs.readfile(community) or ""
+    end
+
+    function f.handle(self, state, data)
+        if state == FORM_VALID then
+            if data.cop then
+                fs.writefile(cop, data.rcs:gsub("\r\n", "\n"))
+            end
+        end
+        return true
+    end
+    return f
 end
 
-function f.handle(self, state, data)
-    if state == FORM_VALID then
-        if data.cop then
-            fs.writefile(cop, data.rcs:gsub("\r\n", "\n"))
-        end
-    end
-    return true
-end
-
-return f
-

luci/trunk/modules/freifunk/root/etc/config/freifunk

@@ -71 +71 @@
 
 config 'defaults' 'interface'
-    option 'netmask' '255.0.0.0'
-    option 'dns' '88.198.178.18 141.54.1.1 212.204.49.83 208.67.220.220 208.67.222.222'
+    option 'netmask' '255.255.0.0'
+    option 'dns' '8.8.8.8 212.204.49.83 141.1.1.1'
 
 config 'defaults' 'alias'

luci/trunk/modules/freifunk/root/etc/config/profile_aachen

@@ -8 +8 @@
     option 'splash_network' '10.104.0.0/16'
     option 'splash_prefix' '28'
-
-config 'defaults' 'interface'
-    option 'netmask' '255.255.0.0'

luci/trunk/modules/freifunk/root/etc/config/profile_bergischesland

@@ -14 +14 @@
 config 'defaults' 'wifi_iface'
     option 'bssid' '02:40:00:42:42:42'
-
-config 'defaults' 'interface'
-    option 'netmask' '255.255.0.0'
-

luci/trunk/modules/freifunk/root/etc/config/profile_berlin

@@ -11 +11 @@
 config 'defaults' 'wifi_device'
     option 'channel' '10'
+
+config 'defaults' 'interface'
+        option 'netmask' '255.0.0.0'
+

luci/trunk/modules/freifunk/root/etc/config/profile_duesseldorf

@@ -9 +9 @@
     option 'longitude' '6.78449'
 
-config 'defaults' 'interface'
-    option 'netmask' '255.255.0.0'
-
 config 'defaults' 'wifi_device'
     option 'channel' '3'

luci/trunk/modules/freifunk/root/etc/config/profile_hannover

@@ -11 +11 @@
 config 'defaults' 'wifi_iface'
     option 'bssid' 'CA:FF:EE:CA:FF:EE'
-
-config 'defaults' 'interface'
-    option 'netmask' '255.255.0.0'
-

luci/trunk/modules/freifunk/root/etc/config/profile_kiberpipa

@@ -14 +14 @@
 config 'defaults' 'interface'
     option 'dns' '10.14.0.1 208.67.222.220 208.67.220.222'
-    option 'netmask' '255.255.0.0'

luci/trunk/modules/freifunk/root/etc/config/profile_mainz

@@ -14 +14 @@
 config 'defaults' 'wifi_device'
     option 'channel' '1'
-
-config 'defaults' 'interface'
-    option 'netmask' '255.255.0.0'
-

luci/trunk/modules/freifunk/root/etc/config/profile_marburg

@@ -11 +11 @@
 config 'defaults' 'interface'
     option 'dns' '8.8.8.8 212.204.49.83'
-        option 'netmask' '255.255.0.0'

luci/trunk/modules/freifunk/root/etc/config/profile_neuss

@@ -12 +12 @@
     option 'channel' '11'
 
-config 'defaults' 'interface'
-    option 'netmask' '255.255.0.0'
-
 config 'defaults' 'wifi_iface'
     option 'bssid' 'DE:AD:BE:EF:CA:FE'

luci/trunk/modules/freifunk/root/etc/config/profile_openwireless_bern

@@ -10 +10 @@
 
 config 'defaults' 'interface'
-    option 'netmask' '255.255.0.0'
     option 'dns' '208.67.222.222 208.67.220.220'
 

luci/trunk/modules/freifunk/root/etc/config/profile_potsdam

@@ -9 +9 @@
     option 'longitude' '13.06489'
 
-config 'defaults' 'interface'
-    option 'netmask' '255.255.0.0'
-
 config 'defaults' 'wifi_device'
     option 'channel' '13'

luci/trunk/modules/freifunk/root/etc/config/profile_rosbach

@@ -14 +14 @@
 config 'defaults' 'wifi_iface'
     option 'bssid' 'D2:CA:FF:EE:BA:BE'
-
-config 'defaults' 'interface'
-        option 'netmask' '255.255.0.0'

luci/trunk/modules/freifunk/root/etc/config/profile_seefeld

@@ -9 +9 @@
     option 'longitude' '11.21279'
 
-config 'defaults' 'interface'
-    option 'netmask' '255.255.255.0'
-
 config 'defaults' 'wifi_device'
     option 'channel' '1'

luci/trunk/modules/freifunk/root/etc/config/profile_wlanljubljana

@@ -14 +14 @@
 config 'defaults' 'interface'
     option 'dns' '10.254.0.1 10.254.0.2'
-    option 'netmask' '255.255.0.0'