[asterisk-commits] pabelanger: branch 1.8 r301311 - in /branches/1.8: ./ configs/

[SVN commits to the Asterisk project]

Author: pabelanger
Date: Tue Jan 11 13:16:06 2011
New Revision: 301311

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=301311
Log:
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
........

Modified:
    branches/1.8/   (props changed)
    branches/1.8/configs/extensions.conf.sample

Propchange: branches/1.8/
------------------------------------------------------------------------------
Binary property 'branch-1.6.2-merged' - no diff available.

Modified: branches/1.8/configs/extensions.conf.sample
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/configs/extensions.conf.sample?view=diff&rev=301311&r1=301310&r2=301311
==============================================================================
--- branches/1.8/configs/extensions.conf.sample (original)
+++ branches/1.8/configs/extensions.conf.sample Tue Jan 11 13:16:06 2011
@@ -456,7 +456,7 @@
 ; 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.,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]