Add match_all_s variable - match all including s

Move enable_voicemail to voicemailconf.
Ignore variables beginning with _ in certain sections
This commit is contained in:
Michael Geddes 2009-01-27 02:39:12 +00:00
parent 61146aee6c
commit 84d6b1e148

View file

@ -26,6 +26,7 @@ init_dialplanconf() {
} }
match_all="_[0-9*+#]." match_all="_[0-9*+#]."
match_all_s="_[0-9*+#s]."
dialplangeneral_list="static writeprotect canreinvite clearglobalvars" dialplangeneral_list="static writeprotect canreinvite clearglobalvars"
dialplangeneral_list_ex="lastdialed lastdialedtype voiceboxext answerfirst dialtimeout allowtransfer international internationalout" dialplangeneral_list_ex="lastdialed lastdialedtype voiceboxext answerfirst dialtimeout allowtransfer international internationalout"
@ -60,14 +61,6 @@ append_dialplan_context() {
reload_dialplan() astcmd "dialplan reload" reload_dialplan() astcmd "dialplan reload"
# Voicemail
enable_voicemail() {
enable_module res_adsi
enable_module app_voicemail
enable_format gsm
}
add_dialplan_exten() { add_dialplan_exten() {
local context=$1 local context=$1
logdebug 3 "Exten: $2" logdebug 3 "Exten: $2"
@ -170,6 +163,7 @@ handle_inzone() {
caller_ITEM*|caller) append inzone_${context_name}_caller "$2" " " ;; caller_ITEM*|caller) append inzone_${context_name}_caller "$2" " " ;;
include_ITEM*|include) append inzone_${context_name}_include "$2" " " ;; include_ITEM*|include) append inzone_${context_name}_include "$2" " " ;;
match_LENGTH|caller_LENGTH|include_LENGTH) ;; match_LENGTH|caller_LENGTH|include_LENGTH) ;;
_*) ;;
*) logerror "Invalid Dialplan inzone option: $1" ;; *) logerror "Invalid Dialplan inzone option: $1" ;;
esac esac
} }
@ -601,6 +595,7 @@ handle_dialplan(){
case $1 in case $1 in
include_LENGTH) ;; include_LENGTH) ;;
include|include_ITEM*) add_dialplan_include ${context_name} $2 ;; include|include_ITEM*) add_dialplan_include ${context_name} $2 ;;
_*) ;;
*) *)
lhs=$1 lhs=$1
logdebug 4 "Add extension $lhs" logdebug 4 "Add extension $lhs"
@ -851,7 +846,7 @@ handle_incoming() {
logerror "No target type specified for target=$2 in ${incoming_context}" logerror "No target type specified for target=$2 in ${incoming_context}"
fi fi
;; ;;
target_COUNT|member_COUNT) ;; target_LENGTH|member_LENGTH) ;;
*) logerror "Invalid option $1 in incoming" ;; *) logerror "Invalid option $1 in incoming" ;;
esac esac
} }