Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
2) Dropped some currently unneeded, commented-out, code from pbx-users.lua.
This commit is contained in:
Iordan Iordanov 2011-11-05 18:34:12 +00:00
parent f976533433
commit 5cd67479c3
8 changed files with 804 additions and 818 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
applications/luci-pbx/luasrc/model/cbi/pbx-advanced.lua
View file

@ -239,11 +239,12 @@ s:tab("remote_usage", translate("Remote Usage"),
NAT or QoS on another device.", appname, defaultrtpstart, defaultrtpend)) NAT or QoS on another device.", appname, defaultrtpstart, defaultrtpend))
s:tab("qos", translate("QoS Settings"), s:tab("qos", translate("QoS Settings"),
translate("If you experience jittery or high latency audio during heavy downloads, you may want to enable QoS.\ translate("If you experience jittery or high latency audio during heavy downloads, you may want \
QoS prioritizes traffic to and from your network for specified ports and IP addresses, resulting in\ to enable QoS. QoS prioritizes traffic to and from your network for specified ports and IP \
better latency and throughput for sound in our case. If enabled below, a QoS rule for this service will\ addresses, resulting in better latency and throughput for sound in our case. If enabled below, \
be configured by the PBX automatically, but you must visit the QoS configuration page (Network->QoS) to\ a QoS rule for this service will be configured by the PBX automatically, but you must visit the \
configure other critical QoS settings like Download and Upload speed.")) 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"), 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\ translate("This is the name that the VoIP server will use to identify itself when\

4
applications/luci-pbx/luasrc/model/cbi/pbx-calls.lua
View file

@ -63,8 +63,8 @@ s = m:section(NamedSection, "outgoing_calls", "call_routing", translate("Outgoin
it by default, if no other provider's prefixes match. The system will automatically\ 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\ 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\ 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\ are discarded (e.g. 00, 011, 010, 0011). Entries can be made in a space-separated\
space-separated list, and/or one per line by hitting enter after every one.")) list, and/or one per line by hitting enter after every one."))
s.anonymous = true s.anonymous = true
m.uci:foreach(googlemodulename, "gtalk_jabber", m.uci:foreach(googlemodulename, "gtalk_jabber",

17
applications/luci-pbx/luasrc/model/cbi/pbx-users.lua
View file

@ -29,6 +29,7 @@ modulename = "pbx-users"
modulenamecalls = "pbx-calls" modulenamecalls = "pbx-calls"
modulenameadvanced = "pbx-advanced" modulenameadvanced = "pbx-advanced"
m = Map (modulename, translate("User Accounts"), m = Map (modulename, translate("User Accounts"),
translate("Here you must configure at least one SIP account, which you\ 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\ will use to register with this service. Use this account either in an analog telephony\
@ -39,22 +40,6 @@ m = Map (modulename, translate("User Accounts"),
-- Recreate the config, and restart services after changes are commited to the configuration. -- Recreate the config, and restart services after changes are commited to the configuration.
function m.on_after_commit(self) 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/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/" .. server .. " restart 1\>/dev/null 2\>/dev/null")
end end

2
applications/luci-pbx/root/etc/init.d/pbx-asterisk
View file

@ -88,6 +88,7 @@ INCLUDED_FILES="$WORKDIR/extensions_blacklist.conf $WORKDIR/extensions_callthrou
# In this string, we concatenate all local users enabled to receive calls # In this string, we concatenate all local users enabled to receive calls
# readily formatted for the Dial command. # readily formatted for the Dial command.
localusers_to_ring="" localusers_to_ring=""
# In this string, we keep a list of all users that are enabled for outgoing # In this string, we keep a list of all users that are enabled for outgoing
# calls. It is used at the end to create the user contexts. # calls. It is used at the end to create the user contexts.
localusers_can_dial="" localusers_can_dial=""
@ -591,4 +592,3 @@ start() {
# Enforce ownership of specified files and directories. # Enforce ownership of specified files and directories.
pbx_fix_ownership pbx_fix_ownership
} }