From 2cad3e038a153ad39230aff20c72fc32fa8d0c78 Mon Sep 17 00:00:00 2001 From: Iordan Iordanov Date: Mon, 28 Nov 2011 02:33:52 +0000 Subject: [PATCH] 1) Added default rtpstart and end config values in pbx-advanced. 2) Some rewording of instructions and descriptions. 3) Changed the default hangup context name. --- .../luci-pbx/luasrc/model/cbi/pbx-calls.lua | 16 ++++++++-------- .../luci-pbx/luasrc/model/cbi/pbx-google.lua | 4 +++- .../luci-pbx/root/etc/config/pbx-advanced | 2 ++ .../luci-pbx/root/etc/init.d/pbx-asterisk | 3 +-- .../etc/pbx-asterisk/extensions.conf.TEMPLATE | 2 +- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/applications/luci-pbx/luasrc/model/cbi/pbx-calls.lua b/applications/luci-pbx/luasrc/model/cbi/pbx-calls.lua index 8cede198c5..d4f21cdcc3 100644 --- a/applications/luci-pbx/luasrc/model/cbi/pbx-calls.lua +++ b/applications/luci-pbx/luasrc/model/cbi/pbx-calls.lua @@ -128,7 +128,7 @@ elseif nvalidoutaccounts == 0 then text = translate("NOTE: There are no Google or SIP provider accounts enabled for outgoing calls.") else text = translate("If you have more than one account that can make outgoing calls, you \ - should enter a list of phone numbers and prefixes in the following fields for each \ + should enter a list of phone numbers and/or 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 \ @@ -136,10 +136,10 @@ else 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.") + replace an empty list with a message that the provider dials all numbers not matched by another \ + provider's prefixes. 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.") end @@ -155,7 +155,7 @@ for k,v in pairs(validoutaccounts) do value = self.map:get(section, self.option) if value == nil then - return {translate("Used for numbers unmatched elsewhere")} + return {translate("Dials numbers unmatched elsewhere")} else return value end @@ -206,7 +206,7 @@ for k,v in pairs(validinaccounts) do value = self.map:get(section, self.option) if value == nil then - return {translate("All users enabled for incoming calls")} + return {translate("Rings users enabled for incoming calls")} else return value end @@ -259,7 +259,7 @@ for k,v in pairs(validoutusers) do value = self.map:get(section, self.option) if value == nil then - return {translate("All providers enabled for outgoing calls")} + return {translate("Uses providers enabled for outgoing calls")} else newvalue = {} -- Convert internal names to user@host values. diff --git a/applications/luci-pbx/luasrc/model/cbi/pbx-google.lua b/applications/luci-pbx/luasrc/model/cbi/pbx-google.lua index 32e203e8c0..3c36a168d9 100644 --- a/applications/luci-pbx/luasrc/model/cbi/pbx-google.lua +++ b/applications/luci-pbx/luasrc/model/cbi/pbx-google.lua @@ -32,7 +32,9 @@ 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\" \ + using them for dialing and receiving calls (voice chat and real phone calls). Please \ + make at least one voice call using the Google Talk plugin installable through the \ + GMail interface, and then log out from your account everywhere. Click \"Add\" \ to add as many accounts as you wish.")) -- Recreate the config, and restart services after changes are commited to the configuration. diff --git a/applications/luci-pbx/root/etc/config/pbx-advanced b/applications/luci-pbx/root/etc/config/pbx-advanced index 58af453f92..39da6f880c 100644 --- a/applications/luci-pbx/root/etc/config/pbx-advanced +++ b/applications/luci-pbx/root/etc/config/pbx-advanced @@ -1,3 +1,5 @@ config 'settings' 'advanced' option 'useragent' 'PBX' option 'ringtime' '30' + option 'rtpstart' '19850' + option 'rtpend' '19900' diff --git a/applications/luci-pbx/root/etc/init.d/pbx-asterisk b/applications/luci-pbx/root/etc/init.d/pbx-asterisk index 6b4808b730..5812b3a738 100755 --- a/applications/luci-pbx/root/etc/init.d/pbx-asterisk +++ b/applications/luci-pbx/root/etc/init.d/pbx-asterisk @@ -24,8 +24,7 @@ START=60 # Some global variables MODULENAME=pbx USERAGENT="PBX" -DEFAULTOUTCNTXT=default-outgoing-call-context -HANGUPCNTXT=hangup +HANGUPCNTXT=hangup-call-context GTALKUNVL=unavailable ASTUSER=nobody diff --git a/applications/luci-pbx/root/etc/pbx-asterisk/extensions.conf.TEMPLATE b/applications/luci-pbx/root/etc/pbx-asterisk/extensions.conf.TEMPLATE index a01a22fa31..534945cc11 100644 --- a/applications/luci-pbx/root/etc/pbx-asterisk/extensions.conf.TEMPLATE +++ b/applications/luci-pbx/root/etc/pbx-asterisk/extensions.conf.TEMPLATE @@ -8,7 +8,7 @@ RINGTIME => |RINGTIME| [default] -[context-user-hangup] +[context-user-hangup-call-context] exten => s,1,Hangup() exten => _X.,1,Hangup() -- 2.30.2