This is the initial release of luci-pbx as submitted to the mailing list.

7 files changed, 1172 insertions, 0 deletions

diff --git a/applications/luci-pbx/luasrc/controller/pbx.lua b/applications/luci-pbx/luasrc/controller/pbx.lua
new file mode 100644
index 000000000..127b40705
--- /dev/null
+++ b/applications/luci-pbx/luasrc/controller/pbx.lua
@@ -0,0 +1,29 @@
+--[[
+    Copyright 2011 Iordan Iordanov <iiordanov (AT) gmail.com>
+
+    This file is part of luci-pbx.
+
+    luci-pbx is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    luci-pbx is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with luci-pbx.  If not, see <http://www.gnu.org/licenses/>.
+]]--
+
+module("luci.controller.pbx", package.seeall)
+
+function index()
+	entry({"admin", "services", "pbx"},                 cbi("pbx"),          "PBX",              80)
+	entry({"admin", "services", "pbx", "pbx-google"},   cbi("pbx-google"),   "Google Accounts",   1)
+	entry({"admin", "services", "pbx", "pbx-voip"},     cbi("pbx-voip"),     "SIP Accounts",      2)
+	entry({"admin", "services", "pbx", "pbx-users"},    cbi("pbx-users"),    "User Accounts",     3)
+	entry({"admin", "services", "pbx", "pbx-calls"},    cbi("pbx-calls"),    "Call Routing",      4)
+	entry({"admin", "services", "pbx", "pbs-advanced"}, cbi("pbx-advanced"), "Advanced Settings", 5)
+end
diff --git a/applications/luci-pbx/luasrc/model/cbi/pbx-advanced.lua b/applications/luci-pbx/luasrc/model/cbi/pbx-advanced.lua
new file mode 100644
index 000000000..061982543
--- /dev/null
+++ b/applications/luci-pbx/luasrc/model/cbi/pbx-advanced.lua
@@ -0,0 +1,284 @@
+--[[
+    Copyright 2011 Iordan Iordanov <iiordanov (AT) gmail.com>
+
+    This file is part of luci-pbx.
+
+    luci-pbx is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    luci-pbx is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with luci-pbx.  If not, see <http://www.gnu.org/licenses/>.
+]]--
+
+if     nixio.fs.access("/etc/init.d/asterisk")   then
+   server = "asterisk"
+elseif nixio.fs.access("/etc/init.d/freeswitch") then
+   server = "freeswitch"
+else
+   server = ""
+end
+
+appname         = "PBX"
+modulename      = "pbx-advanced"
+defaultbindport = 5060
+defaultrtpstart = 19850
+defaultrtpend   = 19900
+
+-- Returns all the network related settings, including a constructed RTP range
+function get_network_info()
+	externhost = m.uci:get(modulename, "advanced", "externhost")
+	ipaddr     = m.uci:get("network", "lan", "ipaddr")
+	bindport   = m.uci:get(modulename, "advanced", "bindport")
+	rtpstart   = m.uci:get(modulename, "advanced", "rtpstart")
+	rtpend     = m.uci:get(modulename, "advanced", "rtpend")
+
+	if bindport == nil then bindport = defaultbindport end
+	if rtpstart == nil then rtpstart = defaultrtpstart end
+	if rtpend   == nil then	rtpend   = defaultrtpend   end
+
+	if rtpstart == nil or rtpend == nil then
+		rtprange = nil
+	else
+		rtprange = rtpstart .. "-" .. rtpend
+	end
+
+	return bindport, rtprange, ipaddr, externhost
+end
+
+-- If not present, insert empty rules in the given config & section named PBX-SIP and PBX-RTP
+function insert_empty_sip_rtp_rules(config, section)
+
+		-- Add rules named PBX-SIP and PBX-RTP if not existing
+		found_sip_rule = false
+		found_rtp_rule = false
+		m.uci:foreach(config, section,
+			function(s1)
+				if     s1._name == 'PBX-SIP' then
+					found_sip_rule = true
+				elseif s1._name == 'PBX-RTP' then
+					found_rtp_rule = true
+				end
+			end)
+		
+		if found_sip_rule ~= true then
+			newrule=m.uci:add(config, section)
+			m.uci:set(config, newrule, '_name', 'PBX-SIP')
+		end
+		if found_rtp_rule ~= true then
+			newrule=m.uci:add(config, section)
+			m.uci:set(config, newrule, '_name', 'PBX-RTP')
+		end
+end
+
+-- Delete rules in the given config & section named PBX-SIP and PBX-RTP
+function delete_sip_rtp_rules(config, section)
+
+		-- Remove rules named PBX-SIP and PBX-RTP
+		commit = false
+		m.uci:foreach(config, section,
+			function(s1)
+				if s1._name == 'PBX-SIP' or s1._name == 'PBX-RTP' then
+					m.uci:delete(config, s1['.name'])
+					commit = true
+				end
+			end)
+
+	-- If something changed, then we commit the config.
+	if commit == true then m.uci:commit(config) end
+end
+
+-- Deletes QoS rules associated with this PBX.
+function delete_qos_rules()
+	delete_sip_rtp_rules ("qos", "classify")
+end
+
+
+function insert_qos_rules()
+	-- Insert empty PBX-SIP and PBX-RTP rules if not present.
+	insert_empty_sip_rtp_rules ("qos", "classify")
+
+	-- Get the network information
+	bindport, rtprange, ipaddr, externhost = get_network_info()
+
+	-- Iterate through the QoS rules, and if there is no other rule with the same port
+	-- range at the express service level, insert this rule.
+	commit = false
+	m.uci:foreach("qos", "classify",
+		function(s1)
+			if     s1._name == 'PBX-SIP' then
+				if s1.ports ~= bindport or s1.target ~= "Express" or s1.proto ~= "udp" then
+					m.uci:set("qos", s1['.name'], "ports",  bindport)
+					m.uci:set("qos", s1['.name'], "proto",  "udp")
+					m.uci:set("qos", s1['.name'], "target", "Express")
+					commit = true
+				end
+			elseif s1._name == 'PBX-RTP' then
+				if s1.ports ~= rtprange or s1.target ~= "Express" or s1.proto ~= "udp" then
+					m.uci:set("qos", s1['.name'], "ports",  rtprange)
+					m.uci:set("qos", s1['.name'], "proto",  "udp")
+					m.uci:set("qos", s1['.name'], "target", "Express")
+					commit = true
+				end
+			end
+		end)
+
+	-- If something changed, then we commit the qos config.
+	if commit == true then m.uci:commit("qos") end
+end
+
+-- This function is a (so far) unsuccessful attempt to manipulate the firewall rules from here
+-- Need to do more testing and eventually move to this mode.
+function maintain_firewall_rules()
+	-- Get the network information
+	bindport, rtprange, ipaddr, externhost = get_network_info()
+
+	commit = false
+	-- Only if externhost is set, do we control firewall rules.
+	if externhost ~= nil and bindport ~= nil and rtprange ~= nil then
+		-- Insert empty PBX-SIP and PBX-RTP rules if not present.
+		insert_empty_sip_rtp_rules ("firewall", "rule")
+
+		-- Iterate through the firewall rules, and if the dest_port and dest_ip setting of the\
+		-- SIP and RTP rule do not match what we want configured, set all the entries in the rule\
+		-- appropriately.
+		m.uci:foreach("firewall", "rule",
+			function(s1)
+				if     s1._name == 'PBX-SIP' then
+					if s1.dest_port ~= bindport then
+						m.uci:set("firewall", s1['.name'], "dest_port", bindport)
+						m.uci:set("firewall", s1['.name'], "src", "wan")
+						m.uci:set("firewall", s1['.name'], "proto", "udp")
+						m.uci:set("firewall", s1['.name'], "target", "ACCEPT")
+						commit = true
+					end
+				elseif s1._name == 'PBX-RTP' then
+					if s1.dest_port ~= rtprange then
+						m.uci:set("firewall", s1['.name'], "dest_port", rtprange)
+						m.uci:set("firewall", s1['.name'], "src", "wan")
+						m.uci:set("firewall", s1['.name'], "proto", "udp")
+						m.uci:set("firewall", s1['.name'], "target", "ACCEPT")
+						commit = true
+					end
+				end
+			end)
+	else
+		-- We delete the firewall rules if one or more of the necessary parameters are not set.
+		sip_rule_name=nil
+		rtp_rule_name=nil
+	
+		-- First discover the configuration names of the rules.
+		m.uci:foreach("firewall", "rule",
+			function(s1)
+				if     s1._name == 'PBX-SIP' then
+					sip_rule_name = s1['.name']
+				elseif s1._name == 'PBX-RTP' then
+					rtp_rule_name = s1['.name']
+				end
+			end)
+		
+		-- Then, using the names, actually delete the rules.
+		if sip_rule_name ~= nil then
+			m.uci:delete("firewall", sip_rule_name)
+			commit = true
+		end
+		if rtp_rule_name ~= nil then
+			m.uci:delete("firewall", rtp_rule_name)
+			commit = true
+		end
+	end
+
+	-- If something changed, then we commit the firewall config.
+	if commit == true then m.uci:commit("firewall") end
+end
+
+m = Map (modulename, translate("Advanced Settings"),
+	 translate("This section contains settings which do not need to be changed under\
+		normal circumstances. In addition, here you can configure your system\
+		for use with remote SIP devices, and resolve call quality issues by enabling\
+		the insertion of QoS rules."))
+
+-- Recreate the voip server config, and restart necessary services after changes are commited
+-- to the advanced configuration. The firewall must restart because of "Remote Usage".
+function m.on_after_commit(self)
+
+	-- Make sure firewall rules are in place
+	maintain_firewall_rules()
+
+	-- If insertion of QoS rules is enabled
+	if m.uci:get(modulename, "advanced", "qos_enabled") == "yes" then
+		insert_qos_rules()
+	else
+		delete_qos_rules()
+	end
+
+	luci.sys.call("/etc/init.d/pbx-" .. server .. " restart 1\>/dev/null 2\>/dev/null")
+	luci.sys.call("/etc/init.d/"     .. server .. " restart 1\>/dev/null 2\>/dev/null")
+	luci.sys.call("/etc/init.d/firewall             restart 1\>/dev/null 2\>/dev/null")
+end
+
+-----------------------------------------------------------------------------
+s = m:section(NamedSection, "advanced", "settings", translate("Advanced Settings"))
+s.anonymous = true
+
+s:tab("general",  translate("General Settings"))
+s:tab("remote_usage", translate("Remote Usage"),
+      translatef("You can use your SIP devices/softphones with this system from a remote location\
+	as well, as long as your Internet Service Provider gives you a public IP.\
+	You will be able to call other local users for free (e.g. other Analog Telephone Adapters (ATAs))\
+	and use your VoIP providers to make calls as if you were at local to the PBX.\
+	After configuring this tab, go back to where users are configured and see the new\
+	Server and Port setting you need to configure the SIP devices with. Please note that by default\
+	%s uses UDP port range %d to %d for RTP traffic (which carries voice), in case you need to configure\
+	NAT or QoS on another device.", appname, defaultrtpstart, defaultrtpend))
+
+s:tab("qos",  translate("QoS Settings"), 
+	translate("If you experience jittery or high latency audio during heavy downloads, you may want to enable QoS.\
+	QoS prioritizes traffic to and from your network for specified ports and IP addresses, resulting in\
+	better latency and throughput for sound in our case. If enabled below, a QoS rule for this service will\
+	be configured by the PBX automatically, but you must visit the QoS configuration page (Network->QoS) to\
+	configure other	critical QoS settings like Download and Upload speed."))
+
+ua = s:taboption("general", Value, "useragent", translate("User Agent String"),
+	 translate("This is the name that the VoIP server will use to identify itself when\
+	 	    registering to VoIP (SIP) providers. Some providers require this to a specific\
+		    string matching a hardware SIP device."))
+ua.default = appname
+
+h = s:taboption("remote_usage", Value, "externhost", translate("Domain Name/Dynamic Domain Name"),
+	    translate("You should either have registered a domain name and have a static IP\
+	               address, or have configured Dynamic DNS on this router. Enter a\
+		       domain name which resolves to your external IP address."))
+h.datatype = "hostname"
+
+p = s:taboption("remote_usage", Value, "bindport", translate("External SIP Port"),
+	    translate("Pick a random port number between 6500 and 9500 for the service to listen on.\
+	    	       Do not pick the standard 5060, because it is often subject to brute-force attacks.\
+	    	       When finished, (1) click \"Save and Apply\", and (2) click the \"Restart VoIP Service\"\
+		       button above. Finally, (3) look in the \"SIP Device/Softphone Accounts\" section for\
+		       updated Server and Port settings for your SIP Devices/Softphones."))
+p.datatype = "port"
+
+p = s:taboption("remote_usage", Value, "rtpstart", translate("RTP Port Range Start"),
+	    translate("RTP traffic carries actual voice packets. This is the start of the port range\
+	    	       which will be used for setting up RTP communication. It's usually OK to leave this\
+		       at the default value."))
+p.datatype = "port"
+p.default = defaultrtpstart
+
+p = s:taboption("remote_usage", Value, "rtpend", translate("RTP Port Range End"))
+p.datatype = "port"
+p.default = defaultrtpend
+
+p = s:taboption("qos", ListValue, "qos_enabled", translate("Insert QoS Rules"))
+p:value("yes", translate("Yes"))
+p:value("no",  translate("No"))
+p.default = "yes"
+
+return m
diff --git a/applications/luci-pbx/luasrc/model/cbi/pbx-calls.lua b/applications/luci-pbx/luasrc/model/cbi/pbx-calls.lua
new file mode 100644
index 000000000..029c5b06a
--- /dev/null
+++ b/applications/luci-pbx/luasrc/model/cbi/pbx-calls.lua
@@ -0,0 +1,359 @@
+--[[
+    Copyright 2011 Iordan Iordanov <iiordanov (AT) gmail.com>
+
+    This file is part of luci-pbx.
+
+    luci-pbx is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    luci-pbx is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with luci-pbx.  If not, see <http://www.gnu.org/licenses/>.
+]]--
+
+if     nixio.fs.access("/etc/init.d/asterisk")   then
+   server = "asterisk"
+elseif nixio.fs.access("/etc/init.d/freeswitch") then
+   server = "freeswitch"
+else
+   server = ""
+end
+
+modulename       = "pbx-calls"
+voipmodulename   = "pbx-voip"
+googlemodulename = "pbx-google"
+usersmodulename  = "pbx-users"
+
+-- This function builds and returns a table with all the entries in a given "module" and "section".
+function get_existing_entries(module, section)
+   i = 1
+   existing_entries = {}
+   m.uci:foreach(module, section,
+		 function(s1)
+		    existing_entries[i] = s1
+		    i = i + 1
+		 end)
+   return existing_entries
+end
+
+-- This function is used to build and return a table where the name field for
+-- every element in a table entries are the indexes to the table (used to check
+-- validity of user input.
+function get_valid_names(entries)
+   validnames={}
+   for index,value in ipairs(entries) do
+      validnames[entries[index].name] = true
+   end
+   return validnames
+end
+
+-- This function is used to build and return a table where the defaultuser field for
+-- every element in a table entries are the indexes to the table (used to check
+-- validity of user input.
+function get_valid_defaultusers(entries)
+   validnames={}
+   for index,value in ipairs(entries) do
+      validnames[entries[index].defaultuser] = true
+   end
+   return validnames
+end
+
+function is_valid_extension(exten)
+   return (exten:match("[#*+0-9NXZ]+$") ~= nil)
+end
+
+m = Map (modulename, translate("Call Routing"),
+	 translate("This is where you indicate which Google/SIP accounts are used to call what \
+		   country/area codes, which users can use which SIP/Google accounts, how incoming\
+		   calls are routed, what numbers can get into this PBX with a password, and what\
+		   numbers are blacklisted."))
+
+-- Recreate the config, and restart services after changes are commited to the configuration.
+function m.on_after_commit(self)
+	luci.sys.call("/etc/init.d/pbx-" .. server .. " restart 1\>/dev/null 2\>/dev/null")
+	luci.sys.call("/etc/init.d/"     .. server .. " restart 1\>/dev/null 2\>/dev/null")
+end
+
+----------------------------------------------------------------------------------------------------
+s = m:section(NamedSection, "outgoing_calls", "call_routing", translate("Outgoing Calls"),
+	translate("If you have more than one account which can make outgoing calls, you\
+		should enter a list of phone numbers and prefixes in the following fields for each\
+		provider listed. Invalid prefixes are removed silently, and only 0-9, X, Z, N, #, *,\
+		and + are valid characters. The letter X matches 0-9, Z matches 1-9, and N matches 2-9.\
+		For example to make calls to Germany through a provider, you can enter 49. To make calls\
+		to North America, you can enter 1NXXNXXXXXX. If one of your providers can make \"local\"\
+		calls to an area code like New York's 646, you can enter 646NXXXXXX for that\
+		provider. You should leave one account with an empty list to make calls with\
+		it by default, if no other provider's prefixes match. The system will automatically\
+		replace an empty list with a message that the provider dials all numbers. Be as specific as\
+		possible (i.e. 1NXXNXXXXXX is better than 1). Please note all international dial codes\
+		are discarded (e.g. 00, 011, 010, 0011). Entries can be made in a\
+		space-separated list, and/or one per line by hitting enter after every one."))
+s.anonymous = true
+
+m.uci:foreach(googlemodulename, "gtalk_jabber", 
+	      function(s1)
+		 if s1.username ~= nil and s1.name ~= nil and
+		    s1.make_outgoing_calls == "yes" then
+		    patt = s:option(DynamicList, s1.name, s1.username)
+
+		    -- If the saved field is empty, we return a string
+		    -- telling the user that this account would dial any exten.
+		    function patt.cfgvalue(self, section)
+		       value = self.map:get(section, self.option)
+
+		       if value == nil then
+			  return {"Dials any number"}
+		       else
+			  return value
+		       end
+		    end
+
+		    -- Write only valid extensions into the config file.
+		    function patt.write(self, section, value)
+		       newvalue = {}
+		       nindex = 1
+		       for index, field in ipairs(value) do
+			  if is_valid_extension(value[index]) == true then
+			     newvalue[nindex] = value[index]
+			     nindex = nindex + 1
+			  end
+		       end
+		       DynamicList.write(self, section, newvalue)
+		    end
+		 end
+	      end)
+
+m.uci:foreach(voipmodulename, "voip_provider", 
+	      function(s1)
+		 if s1.defaultuser ~= nil and s1.host ~= nil and 
+		    s1.name ~= nil        and s1.make_outgoing_calls == "yes" then
+		    patt = s:option(DynamicList, s1.name, s1.defaultuser .. "@" .. s1.host)
+
+		    -- If the saved field is empty, we return a string
+		    -- telling the user that this account would dial any exten.
+		    function patt.cfgvalue(self, section)
+		       value = self.map:get(section, self.option)
+
+		       if value == nil then
+			  return {"Dials any number"}
+		       else
+			  return value
+		       end
+		    end
+
+		    -- Write only valid extensions into the config file.
+		    function patt.write(self, section, value)
+		       newvalue = {}
+		       nindex = 1
+		       for index, field in ipairs(value) do
+			  if is_valid_extension(value[index]) == true then
+			     newvalue[nindex] = value[index]
+			     nindex = nindex + 1
+			  end
+		       end
+		       DynamicList.write(self, section, newvalue)
+		    end
+		 end
+	      end)
+
+----------------------------------------------------------------------------------------------------
+s = m:section(NamedSection, "incoming_calls", "call_routing", translate("Incoming Calls"),
+	translate("For each provider that receives calls, here you can restrict which users to ring\
+		on incoming calls. If the list is empty, the system will indicate that all users\
+		which are enabled for incoming calls will ring. Invalid usernames will be rejected\
+		silently. Also,	entering a username here overrides the user's setting to not receive\
+		incoming calls,	so this way, you can make users ring only for select providers.\
+		Entries can be made in a space-separated list, and/or one per\
+		line by hitting enter after every one."))
+s.anonymous = true
+
+m.uci:foreach(googlemodulename, "gtalk_jabber", 
+	      function(s1)
+		 if s1.username ~= nil and s1.register == "yes" then
+		    field_name=string.gsub(s1.username, "%W", "_")
+		    gtalkaccts = s:option(DynamicList, field_name, s1.username)
+		    
+		    -- If the saved field is empty, we return a string
+		    -- telling the user that this account would dial any exten.
+		    function gtalkaccts.cfgvalue(self, section)
+		       value = self.map:get(section, self.option)
+		       
+		       if value == nil then
+			  return {"Rings all users"}
+		       else
+			  return value
+		       end
+		    end
+
+		    -- Write only valid user names.
+		    function gtalkaccts.write(self, section, value)
+		       users=get_valid_defaultusers(get_existing_entries(usersmodulename, "local_user"))
+		       newvalue = {}
+		       nindex = 1
+		       for index, field in ipairs(value) do
+			  if users[value[index]] == true then
+			     newvalue[nindex] = value[index]
+			     nindex = nindex + 1
+			  end
+		       end
+		       DynamicList.write(self, section, newvalue)
+		    end
+		 end
+	      end)
+
+
+m.uci:foreach(voipmodulename, "voip_provider", 
+	      function(s1)
+		 if s1.defaultuser ~= nil and s1.host ~= nil and s1.register == "yes" then
+		    field_name=string.gsub(s1.defaultuser .. "_" .. s1.host, "%W", "_")
+		    voipaccts = s:option(DynamicList, field_name, s1.defaultuser .. "@" .. s1.host)
+
+		    -- If the saved field is empty, we return a string
+		    -- telling the user that this account would dial any exten.
+		    function voipaccts.cfgvalue(self, section)
+		       value = self.map:get(section, self.option)
+		       
+		       if value == nil then
+			  return {"Rings all users"}
+		       else
+			  return value
+		       end
+		    end
+
+		    -- Write only valid user names.
+		    function voipaccts.write(self, section, value)
+		       users=get_valid_defaultusers(get_existing_entries(usersmodulename, "local_user"))
+		       newvalue = {}
+		       nindex = 1
+		       for index, field in ipairs(value) do
+			  if users[value[index]] == true then
+			     newvalue[nindex] = value[index]
+			     nindex = nindex + 1
+			  end
+		       end
+		       DynamicList.write(self, section, newvalue)
+		    end
+		 end
+	      end)
+
+----------------------------------------------------------------------------------------------------
+s = m:section(NamedSection, "providers_user_can_use", "call_routing",
+      translate("Providers Used for Outgoing Calls"),
+      translate("If you would like, you could restrict which providers users are allowed to use for outgoing\
+	calls. By default all users can use all providers. To show up in the list below the user should\
+	be allowed to make outgoing calls in the \"User Accounts\" page. Enter VoIP providers in the format\
+	username@some.host.name, as listed in \"Outgoing Calls\" above. It's easiest to copy and paste\
+	the providers from above. Invalid entries will be rejected silently. Also, any entries automatically\
+	change to this PBX's internal naming scheme, with \"_\" replacing all non-alphanumeric characters.\
+	Entries can be made in a space-separated list, and/or one per line by hitting enter after every\
+	one."))
+s.anonymous = true
+
+m.uci:foreach(usersmodulename, "local_user", 
+	      function(s1)
+		 if s1.defaultuser ~= nil and s1.can_call == "yes" then
+		    providers = s:option(DynamicList, s1.defaultuser, s1.defaultuser)
+		    
+		    -- If the saved field is empty, we return a string
+		    -- telling the user that this account would dial any exten.
+		    function providers.cfgvalue(self, section)
+		       value = self.map:get(section, self.option)
+		       
+		       if value == nil then
+			  return {"Uses all provider accounts"}
+		       else
+			  return value
+		       end
+		    end
+		    
+		    -- Cook the new values prior to entering them into the config file.
+		    -- Also, enter them only if they are valid.
+		    function providers.write(self, section, value)
+		       validvoip=get_valid_names(get_existing_entries(voipmodulename, "voip_provider"))
+		       validgoog=get_valid_names(get_existing_entries(googlemodulename, "gtalk_jabber"))
+		       cookedvalue = {}
+		       cindex = 1
+		       for index, field in ipairs(value) do
+			  cooked = string.gsub(value[index], "%W", "_")
+			  if validvoip[cooked] == true or validgoog[cooked] == true then
+			     cookedvalue[cindex] = string.gsub(value[index], "%W", "_")
+			     cindex = cindex + 1
+			  end
+		       end
+		       DynamicList.write(self, section, cookedvalue)
+		    end
+		 end
+	      end)
+
+----------------------------------------------------------------------------------------------------
+s = m:section(TypedSection, "callthrough_numbers", translate("Call-through Numbers"),
+	translate("Designate numbers which will be allowed to call through this system and which user's\
+		  privileges it will have."))
+s.anonymous = true
+s.addremove = true
+
+num = s:option(DynamicList, "callthrough_number_list", translate("Call-through Numbers"))
+num.datatype = "uinteger"
+
+p = s:option(ListValue, "enabled", translate("Enabled"))
+p:value("yes", translate("Yes"))
+p:value("no",  translate("No"))
+p.default = "yes"
+
+user = s:option(Value, "defaultuser",  translate("User Name"),
+	 translate("The number(s) specified above will be able to dial outwith this user's providers.\
+		   Invalid usernames are dropped silently, please verify that the entry was accepted."))
+function user.write(self, section, value)
+   users=get_valid_defaultusers(get_existing_entries(usersmodulename, "local_user"))
+   if users[value] == true then
+      Value.write(self, section, value)
+   end
+end
+
+pwd = s:option(Value, "pin", translate("PIN"),
+	       translate("Your PIN disappears when saved for your protection. It will be changed\
+			 only when you enter a value different from the saved one. Leaving the PIN\
+			 empty is possible, but please beware of the security implications."))
+pwd.password = true
+pwd.rmempty = false
+
+-- We skip reading off the saved value and return nothing.
+function pwd.cfgvalue(self, section)
+    return "" 
+end
+
+-- We check the entered value against the saved one, and only write if the entered value is
+-- something other than the empty string, and it differes from the saved value.
+function pwd.write(self, section, value)
+    local orig_pwd = m:get(section, self.option)
+    if value and #value > 0 and orig_pwd ~= value then
+        Value.write(self, section, value)
+    end
+end
+
+----------------------------------------------------------------------------------------------------
+s = m:section(NamedSection, "blacklisting", "call_routing", translate("Blacklisted Numbers"),
+		 translate("Enter phone numbers that you want to decline calls from automatically.\
+			You should probably omit the country code and any leading\
+			zeroes, but please experiment to make sure you are blocking numbers from your\
+			desired area successfully."))
+s.anonymous = true
+
+b = s:option(DynamicList, "blacklist1", translate("Dynamic List of Blacklisted Numbers"),
+       	    translate("Specify numbers individually here. Press enter to add more numbers."))
+b.cast = "string"
+b.datatype = "uinteger"
+
+b = s:option(Value, "blacklist2", translate("Space-Separated List of Blacklisted Numbers"),
+	    translate("Copy-paste large lists of numbers here."))
+b.template = "cbi/tvalue"
+b.rows = 3
+
+return m
diff --git a/applications/luci-pbx/luasrc/model/cbi/pbx-google.lua b/applications/luci-pbx/luasrc/model/cbi/pbx-google.lua
new file mode 100644
index 000000000..128c7a307
--- /dev/null
+++ b/applications/luci-pbx/luasrc/model/cbi/pbx-google.lua
@@ -0,0 +1,120 @@
+--[[
+    Copyright 2011 Iordan Iordanov <iiordanov (AT) gmail.com>
+
+    This file is part of luci-pbx.
+
+    luci-pbx is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    luci-pbx is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with luci-pbx.  If not, see <http://www.gnu.org/licenses/>.
+]]--
+
+if     nixio.fs.access("/etc/init.d/asterisk")   then
+   server = "asterisk"
+elseif nixio.fs.access("/etc/init.d/freeswitch") then
+   server = "freeswitch"
+else
+   server = ""
+end
+
+modulename           = "pbx-google"
+googlemodulename     = "pbx-google"
+defaultstatus        = "dnd"
+defaultstatusmessage = "PBX online, may lose messages"
+
+m = Map (modulename, translate("Google Accounts"),
+	 translate("This is where you set up your Google (Talk and Voice) Accounts, in order to start\
+		using them for dialing and receiving calls (voice chat and real phone calls). Click \"Add\"\
+		to add as many accounts as you wish."))
+
+-- Recreate the config, and restart services after changes are commited to the configuration.
+function m.on_after_commit(self)
+   -- Create a field "name" for each account which identifies the account in the backend.
+   commit = false
+   m.uci:foreach(modulename, "gtalk_jabber", 
+		 function(s1)
+		    if s1.username ~= nil then
+		       name=string.gsub(s1.username, "%W", "_")
+		       if s1.name ~= name then
+			  m.uci:set(modulename, s1['.name'], "name", name)
+			  commit = true
+		       end
+		    end
+		 end)
+   if commit == true then  m.uci:commit(modulename) end
+   
+   luci.sys.call("/etc/init.d/pbx-" .. server .. " restart 1\>/dev/null 2\>/dev/null")
+   luci.sys.call("/etc/init.d/asterisk             restart 1\>/dev/null 2\>/dev/null")
+end
+
+-----------------------------------------------------------------------------
+s = m:section(TypedSection, "gtalk_jabber", translate("Google Voice/Talk Accounts"))
+s.anonymous = true
+s.addremove = true
+
+s:option(Value, "username",     translate("Email"))
+
+pwd = s:option(Value, "secret", translate("Password"),
+	       translate("When your password is saved, it disappears from this field and is not displayed\
+			 for your protection. The previously saved password will be changed only when you\
+			 enter a value different from the saved one."))
+pwd.password = true
+pwd.rmempty = false
+
+-- We skip reading off the saved value and return nothing.
+function pwd.cfgvalue(self, section)
+    return "" 
+end
+
+-- We check the entered value against the saved one, and only write if the entered value is
+-- something other than the empty string, and it differes from the saved value.
+function pwd.write(self, section, value)
+    local orig_pwd = m:get(section, self.option)
+    if value and #value > 0 and orig_pwd ~= value then
+        Value.write(self, section, value)
+    end
+end
+
+
+p = s:option(ListValue, "register",
+	     translate("Enable Incoming Calls (See Status, Message below)"),
+	     translate("When somebody starts voice chat with your GTalk account or calls the GVoice,\
+		       number (if you have Google Voice), the call will be forwarded to any users\
+			that are online (registered using a SIP device or softphone) and permitted to\
+			receive the call. If you have Google Voice, you must go to your GVoice settings and\
+			forward calls to Google chat in order to actually receive calls made to your\
+			GVoice number. If you have trouble receiving calls from GVoice, experiment\
+			with the Call Screening option in your GVoice Settings. Finally, make sure no other\
+			client is online with this account (browser in gmail, mobile/desktop Google Talk\
+			App) as it may interfere."))
+p:value("yes", translate("Yes"))
+p:value("no",  translate("No"))
+p.default = "yes"
+
+p = s:option(ListValue, "make_outgoing_calls", translate("Enable Outgoing Calls"),
+	     translate("Use this account to make outgoing calls as configured in the \"Call Routing\" section."))
+p:value("yes", translate("Yes"))
+p:value("no",  translate("No"))
+p.default = "yes"
+
+st = s:option(ListValue, "status", translate("Account Status"))
+st:depends("register", "yes")
+st:value("dnd", translate("Do Not Disturb"))
+st:value("away",  translate("Away"))
+st:value("available",  translate("Available"))
+st.default = defaultstatus
+
+stm = s:option(Value, "statusmessage", translate("Account Status Message"),
+	     translate("Avoid using anything but alpha-numeric characters, space, comma, and period."))
+stm:depends("register", "yes")
+stm.default = defaultstatusmessage
+
+return m
diff --git a/applications/luci-pbx/luasrc/model/cbi/pbx-users.lua b/applications/luci-pbx/luasrc/model/cbi/pbx-users.lua
new file mode 100644
index 000000000..7c25308cd
--- /dev/null
+++ b/applications/luci-pbx/luasrc/model/cbi/pbx-users.lua
@@ -0,0 +1,148 @@
+--[[
+    Copyright 2011 Iordan Iordanov <iiordanov (AT) gmail.com>
+
+    This file is part of luci-pbx.
+
+    luci-pbx is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    luci-pbx is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with luci-pbx.  If not, see <http://www.gnu.org/licenses/>.
+]]--
+
+if     nixio.fs.access("/etc/init.d/asterisk")   then
+   server = "asterisk"
+elseif nixio.fs.access("/etc/init.d/freeswitch") then
+   server = "freeswitch"
+else
+   server = ""
+end
+
+modulename         = "pbx-users"
+modulenamecalls    = "pbx-calls"
+modulenameadvanced = "pbx-advanced"
+	
+m = Map (modulename, translate("User Accounts"), 
+	translate("Here you must configure at least one SIP account, which you\
+		will use to register with this service. Use this account either in an analog telephony\
+		adapter (ATA), or in a SIP softphone like CSipSimple, Linphone, or Sipdroid on your\
+		Android smartphone, or X-lite or Ekiga on your computer. By default, all SIP accounts\
+		will ring simultaneously if a call is made to one of your VoIP provider accounts or GV\
+		numbers."))
+
+-- Recreate the config, and restart services after changes are commited to the configuration.
+function m.on_after_commit(self)
+	--allusers = ""
+	--ringusers = ""
+	--
+	---- Create two lists of users - one of all users and one of users enabled for incoming calls.
+	--m.uci:foreach(modulename, "local_user",
+	--	function(s1)
+	--		allusers = allusers .. " " .. s1.defaultuser
+	--		if s1.ring == "yes" then
+	--			ringusers = ringusers .. " " .. s1.defaultuser
+	--		end
+	--	end)
+	--
+	--m.uci:set (modulenamecalls, "valid_users", "allusers",  allusers)
+	--m.uci:set (modulenamecalls, "valid_users", "ringusers", ringusers)
+	--m.uci:commit (modulenamecalls)
+
+	luci.sys.call("/etc/init.d/pbx-" .. server .. " restart 1\>/dev/null 2\>/dev/null")
+	luci.sys.call("/etc/init.d/"     .. server .. " restart 1\>/dev/null 2\>/dev/null")
+end
+
+externhost = m.uci:get(modulenameadvanced, "advanced", "externhost")
+bindport   = m.uci:get(modulenameadvanced, "advanced", "bindport")
+ipaddr     = m.uci:get("network", "lan", "ipaddr")
+
+-----------------------------------------------------------------------------
+s = m:section(NamedSection, "server", "user", translate("Server Setting"))
+s.anonymous = true
+
+if ipaddr == nil or ipaddr == "" then
+   ipaddr = "(IP address not static)"
+end
+
+if bindport ~= nil then
+   just_ipaddr = ipaddr
+   ipaddr = ipaddr .. ":" .. bindport
+end
+
+s:option(DummyValue, "ipaddr", translate("Server Setting for Local SIP Devices"),
+	 translate("Enter this IP (or IP:port) in the Server/Registrar setting of SIP devices you will\
+		   use ONLY locally and never from a remote location.")).default = ipaddr
+
+if externhost ~= nil then
+   if bindport ~= nil then
+      just_externhost = externhost
+      externhost = externhost .. ":" .. bindport
+   end
+   s:option(DummyValue, "externhost", translate("Server Setting for Remote SIP Devices"),
+	    translate("Enter this hostname (or hostname:port) in the Server/Registrar setting of SIP\
+		      devices you will use from a remote location (they will work locally too).")
+		     ).default = externhost
+end
+
+if bindport ~= nil then
+	s:option(DummyValue, "bindport", translate("Port Setting for SIP Devices"),
+	translatef("If setting Server/Registrar to %s or %s does not work for you, try setting\
+	it to %s or %s and entering this port number in a separate field which specifies the\
+	Server/Registrar port number. Beware that some devices have a confusing\
+	setting which sets the port where SIP requests originate from on the SIP\
+	device itself (bind port). The port specified on this page is NOT this bind port\
+	but the this service listens on.", 
+	ipaddr, externhost, just_ipaddr, just_externhost)).default = bindport
+end
+
+-----------------------------------------------------------------------------
+s = m:section(TypedSection, "local_user", translate("SIP Device/Softphone Accounts"))
+s.anonymous = true
+s.addremove = true
+
+s:option(Value, "fullname", translate("Full Name"),
+	 translate("You can specify a real name to show up in the Caller ID here."))
+
+du = s:option(Value, "defaultuser",  translate("User Name"),
+	 translate("Use (four to five digit) numeric user name if you are connecting normal telephones\
+		   with ATAs to this system (so they can dial user names)."))
+du.datatype = "uciname"
+
+pwd = s:option(Value, "secret", translate("Password"),
+	       translate("Your password disappears when saved for your protection. It will be changed\
+			 only when you enter a value different from the saved one."))
+pwd.password = true
+pwd.rmempty = false
+
+-- We skip reading off the saved value and return nothing.
+function pwd.cfgvalue(self, section)
+    return "" 
+end
+
+-- We check the entered value against the saved one, and only write if the entered value is
+-- something other than the empty string, and it differes from the saved value.
+function pwd.write(self, section, value)
+    local orig_pwd = m:get(section, self.option)
+    if value and #value > 0 and orig_pwd ~= value then
+        Value.write(self, section, value)
+    end
+end
+
+p = s:option(ListValue, "ring", translate("Receives Incoming Calls"))
+p:value("yes", translate("Yes"))
+p:value("no",  translate("No"))
+p.default = "yes"
+
+p = s:option(ListValue, "can_call", translate("Makes Outgoing Calls"))
+p:value("yes", translate("Yes"))
+p:value("no",  translate("No"))
+p.default = "yes"
+
+return m
diff --git a/applications/luci-pbx/luasrc/model/cbi/pbx-voip.lua b/applications/luci-pbx/luasrc/model/cbi/pbx-voip.lua
new file mode 100644
index 000000000..0be3deab6
--- /dev/null
+++ b/applications/luci-pbx/luasrc/model/cbi/pbx-voip.lua
@@ -0,0 +1,116 @@
+--[[
+    Copyright 2011 Iordan Iordanov <iiordanov (AT) gmail.com>
+
+    This file is part of luci-pbx.
+
+    luci-pbx is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    luci-pbx is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with luci-pbx.  If not, see <http://www.gnu.org/licenses/>.
+]]--
+
+if     nixio.fs.access("/etc/init.d/asterisk")   then
+   server = "asterisk"
+elseif nixio.fs.access("/etc/init.d/freeswitch") then
+   server = "freeswitch"
+else
+   server = ""
+end
+
+modulename = "pbx-voip"
+
+m = Map (modulename, translate("SIP Accounts"),
+	 translate("This is where you set up your SIP (VoIP) accounts ts like Sipgate, SipSorcery,\
+	the popular Betamax providers, and any other providers with SIP settings in order to start \
+	using them for dialing and receiving calls (SIP uri and real phone calls). Click \"Add\" to\
+	add as many accounts as you wish."))
+
+-- Recreate the config, and restart services after changes are commited to the configuration.
+function m.on_after_commit(self)
+   commit = false
+   -- Create a field "name" for each account which identifies the account in the backend.
+   m.uci:foreach(modulename, "voip_provider", 
+		 function(s1)
+		    if s1.defaultuser ~= nil and s1.host ~= nil then
+		       name=string.gsub(s1.defaultuser.."_"..s1.host, "%W", "_")
+		       if s1.name ~= name then
+			  m.uci:set(modulename, s1['.name'], "name", name)
+			  commit = true
+		       end
+		    end
+		 end)
+   if commit == true then m.uci:commit(modulename) end
+
+   luci.sys.call("/etc/init.d/pbx-" .. server .. " restart 1\>/dev/null 2\>/dev/null")
+   luci.sys.call("/etc/init.d/"     .. server .. " restart 1\>/dev/null 2\>/dev/null")
+end
+
+-----------------------------------------------------------------------------
+s = m:section(TypedSection, "voip_provider", translate("SIP Provider Accounts"))
+s.anonymous = true
+s.addremove = true
+
+s:option(Value, "defaultuser",  translate("User Name"))
+pwd = s:option(Value, "secret", translate("Password"),
+	       translate("When your password is saved, it disappears from this field and is not displayed\
+			 for your protection. The previously saved password will be changed only when you\
+			 enter a value different from the saved one."))
+
+
+
+pwd.password = true
+pwd.rmempty = false
+
+-- We skip reading off the saved value and return nothing.
+function pwd.cfgvalue(self, section)
+    return "" 
+end
+
+-- We check the entered value against the saved one, and only write if the entered value is
+-- something other than the empty string, and it differes from the saved value.
+function pwd.write(self, section, value)
+    local orig_pwd = m:get(section, self.option)
+    if value and #value > 0 and orig_pwd ~= value then
+        Value.write(self, section, value)
+    end
+end
+
+h = s:option(Value, "host", translate("SIP Server/Registrar"))
+h.datatype = "host"
+
+p = s:option(ListValue, "register", translate("Enable Incoming Calls (Register via SIP)"),
+	     translate("This option should be set to \"Yes\" if you have a DID \(real telephone number\)\
+	     		associated with this SIP account or want to receive SIP uri calls through this\
+			provider.")) 
+p:value("yes", translate("Yes"))
+p:value("no",  translate("No"))
+p.default = "yes"
+
+p = s:option(ListValue, "make_outgoing_calls", translate("Enable Outgoing Calls"),
+	     translate("Use this account to make outgoing calls."))
+p:value("yes", translate("Yes"))
+p:value("no",  translate("No"))
+p.default = "yes"
+
+from = s:option(Value, "fromdomain",
+		translate("SIP Realm (needed by some providers)"))
+from.optional = true
+from.datatype = "host"
+
+port = s:option(Value, "port", translate("SIP Server/Registrar Port"))
+port.optional = true
+port.datatype = "port"
+
+op = s:option(Value, "outboundproxy", translate("Outbound Proxy"))
+op.optional = true
+op.datatype = "host"
+
+return m
diff --git a/applications/luci-pbx/luasrc/model/cbi/pbx.lua b/applications/luci-pbx/luasrc/model/cbi/pbx.lua
new file mode 100644
index 000000000..f73930eee
--- /dev/null
+++ b/applications/luci-pbx/luasrc/model/cbi/pbx.lua
@@ -0,0 +1,116 @@
+--[[
+    Copyright 2011 Iordan Iordanov <iiordanov (AT) gmail.com>
+
+    This file is part of luci-pbx.
+
+    luci-pbx is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    luci-pbx is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with luci-pbx.  If not, see <http://www.gnu.org/licenses/>.
+]]--
+
+if     nixio.fs.access("/etc/init.d/asterisk")   then
+   server = "asterisk"
+elseif nixio.fs.access("/etc/init.d/freeswitch") then
+   server = "freeswitch"
+else
+   server = ""
+end
+
+modulename = "pbx"
+
+function mysplit(inputstr, sep)
+        if sep == nil then
+                sep = "%s"
+        end
+        t={} ; i=1
+        for str in string.gmatch(inputstr, "([^"..sep.."]+)") do
+                t[i] = str
+                i = i + 1
+        end
+        return t
+end
+
+function format_two_indices(string, ind1, ind2)
+	lines=mysplit(string, "\n")
+
+	words={}
+	for index,value in ipairs(lines) do
+	        words[index]=mysplit(value)
+	end
+
+	output = ""
+	for index,value in ipairs(words) do
+	        if value[ind1] ~= nil and value[ind2] ~= nil then
+	                output = output .. string.format("%-40s \t %-20s\n", value[ind1], value[ind2])
+	        end
+	end
+	return output
+end
+
+function format_one_index(string, ind1)
+	lines=mysplit(string, "\n")
+
+	words={}
+	for index,value in ipairs(lines) do
+	        words[index]=mysplit(value)
+	end
+
+	output = ""
+	for index,value in ipairs(words) do
+	        if value[ind1] ~= nil then
+	                output = output .. string.format("%-40s\n", value[ind1])
+	        end
+	end
+	return output
+end
+
+m = Map (modulename, translate("PBX Main Page"),
+	 translate("This configuration page allows you to configure a phone system (PBX) service which\
+		   permits making phone calls with, and sharing multiple Google and SIP (like Sipgate,\
+                   SipSorcery, and Betamax) accounts among many SIP devices. Note that Google\
+		   accounts, SIP accounts, and local user accounts are configured in the\
+		   \"Google Accounts\", \"SIP Accounts\", and \"User Accounts\" sub-sections.\
+      You must configure at least one local SIP account\
+      on this PBX, to make and receive calls with your Google/SIP accounts.\
+      Configuring multiple users will allow you to make free calls between users, and share the configured\
+      Google and SIP accounts. If you have more than one Google and SIP accounts set up,\
+      you should probably configure how calls to and from them are routed in the \"Call Routing\" page.\
+      If you're interested in using your own PBX from anywhere in the world,\
+      then visit the \"Remote Usage\" section in the \"Advanced Settings\" page."))
+
+----------------------------------------------------------------------------------------------------
+s = m:section(NamedSection, "connection_status", "main", translate("Service Control and Connection Status"))
+s.anonymous = true
+
+s:option (DummyValue, "status", translate("Service Status"))
+
+sts = s:option(DummyValue, "_sts") 
+sts.template = "cbi/tvalue"
+sts.rows = 20
+
+function sts.cfgvalue(self, section)
+
+   if server == "asterisk" then
+      reg  = luci.sys.exec("asterisk -rx 'sip show registry' | sed 's/peer-//'")
+      jab  = luci.sys.exec("asterisk -rx 'jabber show connections' | grep onnected")
+      usrs = luci.sys.exec("asterisk -rx 'sip show users'")
+      chan = luci.sys.exec("asterisk -rx 'core show channels'")
+      return format_two_indices(reg, 1, 5) .. format_two_indices(jab, 2, 4) .. "\n" 
+             .. format_one_index(usrs,1) .. "\n" .. chan
+   elseif server == "freeswitch" then
+      return "Freeswitch is not supported yet.\n"
+   else
+      return "Neither Asterisk nor FreeSwitch discovered, please install Asterisk, as Freeswitch is not supported yet.\n"
+   end
+end
+
+return m