update voice_client

This commit is contained in:
Sukru Senli 2015-05-22 15:56:36 +02:00 committed by Martin Schröder
parent 5bc41eb98d
commit 6505a5eaed
2 changed files with 18 additions and 4 deletions

View file

@ -19,7 +19,7 @@ exten => _X.,1, Transfer(SIP/${EXTEN}@|PROVIDER|,,)
[|PROVIDER|-outgoing]
; Context used for normal outgoing calls
exten => _[*#0-9].,1, Set(DIAL_EXTEN=${EXTEN})
|SPEED_DIAL|exten => _[*#0-9].,1, Set(DIAL_EXTEN=${EXTEN})
exten => _[*#0-9].,n, |CUSTOM_OUTGOING|
exten => _[*#0-9].,n, |CALL_FILTER|
exten => _[*#0-9].,n, Set(result=${SHELL(/usr/lib/asterisk/log_call.sh Outgoing |USERNAME| ${DIAL_EXTEN})})

View file

@ -1203,7 +1203,7 @@ get_call_filter()
local call_filter enabled
config_get call_filter $provider call_filter
if ! [ -z "$call_filter" ] ; then
if ! [ -z "$call_filter" -o "$call_filter" == "-" ] ; then
macro="Macro($call_filter-$direction)"
fi
echo $macro
@ -1353,7 +1353,7 @@ configure_extensions_provider()
local callforward_enabled
local cbbs_enabled
local callreturn_enabled
local redial_enabled
local redial_enabled
local mailbox
# load general settings
@ -1378,6 +1378,20 @@ configure_extensions_provider()
echo "Configuring dialplan for SIP Provider $1"
# add speed dial options
speed_dial=""
[ -z "$CONFIG_SECTIONS" ] && return 0
for section in ${CONFIG_SECTIONS}; do
config_get cfgtype "$section" TYPE
[ "x$cfgtype" != "xspeed_dial" ] && continue
local tone
local number
config_get tone $section tone
config_get number $section number
speed_dial="${speed_dial}exten => ${tone},1,Goto($number, 1)\n"
speed_dial="${speed_dial}exten => ${tone}#,1,Goto($number, 1)\n"
done
config_get displayname $1 displayname
[ -z "$displayname" ] && displayname=$user
config_get custom_outgoing custom_dialplan custom_outgoing_enabled
@ -1433,6 +1447,7 @@ configure_extensions_provider()
sed -i "s/|PROVIDER|/$1/g" $WORKDIR/extensions_provider.tmp
sed -i "s/|USERNAME|/$user_without_suffix/g" $WORKDIR/extensions_provider.tmp
sed -i "s/|CUSTOM_OUTGOING|/$custom_outgoing/" $WORKDIR/extensions_provider.tmp
sed -i "s/|SPEED_DIAL|/$speed_dial/" $WORKDIR/extensions_provider.tmp
sed -i "s/|CALL_FILTER|/$call_filter_macro/" $WORKDIR/extensions_provider.tmp
sed -i "s/|DISPLAYNAME|/$(escape_sed_substitution $displayname)/" $WORKDIR/extensions_provider.tmp
@ -2090,4 +2105,3 @@ start_service() {
service_triggers() {
procd_add_reload_trigger voice_client
}