diff options
author | pabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-01-11 19:16:06 +0000 |
---|---|---|
committer | pabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-01-11 19:16:06 +0000 |
commit | c2672ddbec31f495a01065e7f63007a3d602d8dd (patch) | |
tree | c867813110d6d6b71ffa087df56a5fb440b76aa4 /configs | |
parent | 9cc03bc48d23a4ee406011c0cac23193f776199a (diff) |
Merged revisions 301310 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
........
r301310 | pabelanger | 2011-01-11 14:14:31 -0500 (Tue, 11 Jan 2011) | 2 lines
Fix a logic issue when passing context ARG
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@301311 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configs')
-rw-r--r-- | configs/extensions.conf.sample | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/configs/extensions.conf.sample b/configs/extensions.conf.sample index 2489d183b..70ef64761 100644 --- a/configs/extensions.conf.sample +++ b/configs/extensions.conf.sample @@ -456,7 +456,7 @@ exten => _s-.,1,NoOp ; Standard extension subroutine: ; ${EXTEN} - Extension ; ${ARG1} - Device(s) to ring -; ${ARG2} - Optional context in Voicemail (if empty, then "default") +; ${ARG2} - Optional context in Voicemail ; ; Note that the current version will drop through to the next priority in the ; case of their pressing '#'. This gives more flexibility in what do to next: @@ -473,23 +473,19 @@ exten => _X.,50000(stdexten),NoOp(Start stdexten) exten => _X.,n,Set(LOCAL(ext)=${EXTEN}) exten => _X.,n,Set(LOCAL(dev)=${ARG1}) exten => _X.,n,Set(LOCAL(cntx)=${ARG2}) - -exten => _X.,n,Set(LOCAL(mbx)="${ext}"$["${cntx}" ? "@${cntx}" :: ""]) -exten => _X.,n,Dial(${dev},20) ; Ring the interface, 20 seconds maximum +exten => _X.,n,Set(LOCAL(mbx)=${ext}${IF($[!${ISNULL(${cntx})}]?@${cntx})}) +exten => _X.,n,Dial(${dev},20) ; Ring the interface, 20 seconds maximum exten => _X.,n,Goto(stdexten-${DIALSTATUS},1) ; Jump based on status (NOANSWER,BUSY,CHANUNAVAIL,CONGESTION,ANSWER) exten => stdexten-NOANSWER,1,Voicemail(${mbx},u) ; If unavailable, send to voicemail w/ unavail announce -exten => stdexten-NOANSWER,n,NoOp(Finish stdexten NOANSWER) exten => stdexten-NOANSWER,n,Return() ; If they press #, return to start -exten => stdexten-BUSY,1,Voicemail(${mbx},b) - ; If busy, send to voicemail w/ busy announce -exten => stdexten-BUSY,n,NoOp(Finish stdexten BUSY) +exten => stdexten-BUSY,1,Voicemail(${mbx},b) ; If busy, send to voicemail w/ busy announce exten => stdexten-BUSY,n,Return() ; If they press #, return to start exten => _stde[x]te[n]-.,1,Goto(stdexten-NOANSWER,1) ; Treat anything else as no answer -exten => a,1,VoicemailMain(${mbx}) ; If they press *, send the user into VoicemailMain +exten => a,1,VoicemailMain(${mbx}) ; If they press *, send the user into VoicemailMain exten => a,n,Return() [stdPrivacyexten] |