1) Massive whitespace reorganization (untabified, and made consistent everything).

2) Dropped some currently unneeded, commented-out, code from pbx-users.lua.

6 files changed, 487 insertions, 501 deletions

diff --git a/applications/luci-pbx/luasrc/model/cbi/pbx-advanced.lua b/applications/luci-pbx/luasrc/model/cbi/pbx-advanced.lua
index 0619825435..a77bc776a3 100644
--- a/applications/luci-pbx/luasrc/model/cbi/pbx-advanced.lua
+++ b/applications/luci-pbx/luasrc/model/cbi/pbx-advanced.lua
@@ -33,194 +33,194 @@ 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
+        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
+                -- 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
+                -- 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")
+        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
+        -- 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
+        -- 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."))
+         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()
+        -- 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
+        -- 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")
+        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
 
 -----------------------------------------------------------------------------
@@ -230,45 +230,46 @@ 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))
+      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."))
+      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."))
+                 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."))
+                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."))
+                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."))
+                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
 
diff --git a/applications/luci-pbx/luasrc/model/cbi/pbx-calls.lua b/applications/luci-pbx/luasrc/model/cbi/pbx-calls.lua
index 5e4857a9ea..9c91133dfd 100644
--- a/applications/luci-pbx/luasrc/model/cbi/pbx-calls.lua
+++ b/applications/luci-pbx/luasrc/model/cbi/pbx-calls.lua
@@ -39,245 +39,245 @@ 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."))
+         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")
+        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."))
+        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)
-
-		    -- Add provider to the associative array of valid accounts.
-		    validoutaccounts[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
-			  val = luci.util.trim(value[index])
-			  if is_valid_extension(val) == true then
-			     newvalue[nindex] = val
-			     nindex = nindex + 1
-			  end
-		       end
-		       DynamicList.write(self, section, newvalue)
-		    end
-		 end
-	      end)
+              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)
+                    
+                    -- Add provider to the associative array of valid accounts.
+                    validoutaccounts[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
+                          val = luci.util.trim(value[index])
+                          if is_valid_extension(val) == true then
+                             newvalue[nindex] = val
+                             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)
-
-		    -- Add provider to the associative array of valid accounts.
-		    validoutaccounts[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
-			  val = luci.util.trim(value[index])
-			  if is_valid_extension(val) == true then
-			     newvalue[nindex] = val
-			     nindex = nindex + 1
-			  end
-		       end
-		       DynamicList.write(self, section, newvalue)
-		    end
-		 end
-	      end)
+              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)
+                    
+                    -- Add provider to the associative array of valid accounts.
+                    validoutaccounts[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
+                          val = luci.util.trim(value[index])
+                          if is_valid_extension(val) == true then
+                             newvalue[nindex] = val
+                             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."))
+        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)
-		       newvalue = {}
-		       nindex = 1
-		       for index, field in ipairs(value) do
-			  trimuser = luci.util.trim(value[index])
-			  if allvalidusers[trimuser] == true then
-			     newvalue[nindex] = trimuser
-			     nindex = nindex + 1
-			  end
-		       end
-		       DynamicList.write(self, section, newvalue)
-		    end
-		 end
-	      end)
+              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)
+                       newvalue = {}
+                       nindex = 1
+                       for index, field in ipairs(value) do
+                          trimuser = luci.util.trim(value[index])
+                          if allvalidusers[trimuser] == true then
+                             newvalue[nindex] = trimuser
+                             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)
-		       newvalue = {}
-		       nindex = 1
-		       for index, field in ipairs(value) do
-			  trimuser = luci.util.trim(value[index])
-			  if allvalidusers[trimuser] == true then
-			     newvalue[nindex] = trimuser
-			     nindex = nindex + 1
-			  end
-		       end
-		       DynamicList.write(self, section, newvalue)
-		    end
-		 end
-	      end)
+              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)
+                       newvalue = {}
+                       nindex = 1
+                       for index, field in ipairs(value) do
+                          trimuser = luci.util.trim(value[index])
+                          if allvalidusers[trimuser] == true then
+                             newvalue[nindex] = trimuser
+                             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. Entries can be made in a \
-	space-separated list, and/or one per line by hitting enter after every one."))
+        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. 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)
-		 -- Add user to list of all valid users.
-		 if s1.defaultuser ~= nil then allvalidusers[s1.defaultuser] = true end
-
-		 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
-			  newvalue = {}
-			  -- Convert internal names to user@host values.
-			  for i,v in ipairs(value) do
-			     newvalue[i] = validoutaccounts[v]
-			  end
-			  return newvalue
-		       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)
-		       cookedvalue = {}
-		       cindex = 1
-		       for index, field in ipairs(value) do
-			  cooked = string.gsub(luci.util.trim(value[index]), "%W", "_")
-			  if validoutaccounts[cooked] ~= nil then
-			     cookedvalue[cindex] = cooked
-			     cindex = cindex + 1
-			  end
-		       end
-		       DynamicList.write(self, section, cookedvalue)
-		    end
-		 end
-	      end)
+              function(s1)
+                 -- Add user to list of all valid users.
+                 if s1.defaultuser ~= nil then allvalidusers[s1.defaultuser] = true end
+                 
+                 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
+                          newvalue = {}
+                          -- Convert internal names to user@host values.
+                          for i,v in ipairs(value) do
+                             newvalue[i] = validoutaccounts[v]
+                          end
+                          return newvalue
+                       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)
+                       cookedvalue = {}
+                       cindex = 1
+                       for index, field in ipairs(value) do
+                          cooked = string.gsub(luci.util.trim(value[index]), "%W", "_")
+                          if validoutaccounts[cooked] ~= nil then
+                             cookedvalue[cindex] = cooked
+                             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."))
+        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
 
@@ -290,8 +290,8 @@ 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 out with this user's providers.\
-		   Invalid usernames are dropped silently, please verify that the entry was accepted."))
+         translate("The number(s) specified above will be able to dial out with this user's providers.\
+                   Invalid usernames are dropped silently, please verify that the entry was accepted."))
 function user.write(self, section, value)
    trimuser = luci.util.trim(value)
    if allvalidusers[trimuser] == true then
@@ -300,9 +300,9 @@ function user.write(self, section, value)
 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."))
+               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
 
@@ -322,19 +322,19 @@ 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."))
+                 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."))
+            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."))
+            translate("Copy-paste large lists of numbers here."))
 b.template = "cbi/tvalue"
 b.rows = 3
 
diff --git a/applications/luci-pbx/luasrc/model/cbi/pbx-google.lua b/applications/luci-pbx/luasrc/model/cbi/pbx-google.lua
index 128c7a3071..08256dbb72 100644
--- a/applications/luci-pbx/luasrc/model/cbi/pbx-google.lua
+++ b/applications/luci-pbx/luasrc/model/cbi/pbx-google.lua
@@ -31,24 +31,24 @@ 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."))
+         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)
+                 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")
@@ -63,9 +63,9 @@ 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."))
+               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
 
@@ -85,22 +85,22 @@ 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."))
+             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."))
+             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"
@@ -113,7 +113,7 @@ 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."))
+             translate("Avoid using anything but alpha-numeric characters, space, comma, and period."))
 stm:depends("register", "yes")
 stm.default = defaultstatusmessage
 
diff --git a/applications/luci-pbx/luasrc/model/cbi/pbx-users.lua b/applications/luci-pbx/luasrc/model/cbi/pbx-users.lua
index 7c25308cdc..fba0d49dda 100644
--- a/applications/luci-pbx/luasrc/model/cbi/pbx-users.lua
+++ b/applications/luci-pbx/luasrc/model/cbi/pbx-users.lua
@@ -28,35 +28,20 @@ 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."))
+        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")
+        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")
@@ -77,8 +62,8 @@ if bindport ~= nil then
 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
+         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
@@ -86,20 +71,20 @@ if externhost ~= nil then
       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
+            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
+        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
 
 -----------------------------------------------------------------------------
@@ -108,16 +93,16 @@ 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."))
+         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)."))
+         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."))
+               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
 
diff --git a/applications/luci-pbx/luasrc/model/cbi/pbx-voip.lua b/applications/luci-pbx/luasrc/model/cbi/pbx-voip.lua
index 0be3deab6c..c7d9de177b 100644
--- a/applications/luci-pbx/luasrc/model/cbi/pbx-voip.lua
+++ b/applications/luci-pbx/luasrc/model/cbi/pbx-voip.lua
@@ -28,25 +28,25 @@ 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."))
+         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)
+                 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")
@@ -60,9 +60,9 @@ 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."))
+               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."))
 
 
 
@@ -87,21 +87,21 @@ 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.")) 
+             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."))
+             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)"))
+                translate("SIP Realm (needed by some providers)"))
 from.optional = true
 from.datatype = "host"
 
diff --git a/applications/luci-pbx/luasrc/model/cbi/pbx.lua b/applications/luci-pbx/luasrc/model/cbi/pbx.lua
index 13cbcd569d..3f2ee674b5 100644
--- a/applications/luci-pbx/luasrc/model/cbi/pbx.lua
+++ b/applications/luci-pbx/luasrc/model/cbi/pbx.lua
@@ -52,16 +52,16 @@ function format_indices(string, indices)
    for lpos,splitline in ipairs(splitlines) do
       loutput = ""
       for ipos,index in ipairs(indices) do
-	 if splitline[index] ~= nil then
-	    loutput = loutput .. string.format("%-50s", splitline[index])
-	 else
-	    loutput = nil
-	    break
-	 end
+         if splitline[index] ~= nil then
+            loutput = loutput .. string.format("%-50s", splitline[index])
+         else
+            loutput = nil
+            break
+         end
       end
-
+      
       if loutput ~= nil then
-	 output = output .. loutput .. "\n"
+         output = output .. loutput .. "\n"
       end
    end
    return output
@@ -69,7 +69,7 @@ end
 
 
 m = Map (modulename, translate("PBX Main Page"),
- translate("This configuration page allows you to configure a phone system (PBX) service which\
+      translate("This configuration page allows you to configure a phone system (PBX) service which\
       permits making phone calls through multiple Google and SIP (like Sipgate,\
       SipSorcery, and Betamax) accounts and sharing them among many SIP devices. \
       Note that Google accounts, SIP accounts, and local user accounts are configured in the \
@@ -84,7 +84,7 @@ m = Map (modulename, translate("PBX Main Page"),
 
 -----------------------------------------------------------------------------------------
 s = m:section(NamedSection, "connection_status", "main",
-	      translate("Service Control and Connection Status"))
+              translate("Service Control and Connection Status"))
 s.anonymous = true
 
 s:option (DummyValue, "status", translate("Service Status"))
@@ -103,7 +103,7 @@ function sts.cfgvalue(self, section)
 
       return format_indices(regs, {1, 5}) ..
              format_indices(jabs, {2, 4}) .. "\n" ..
-	     format_indices(usrs, {1}   ) .. "\n" .. chan
+             format_indices(usrs, {1}   ) .. "\n" .. chan
 
    elseif server == "freeswitch" then
       return "Freeswitch is not supported yet.\n"