Changeset 3547

Show
Ignore:
Timestamp:
01/05/07 17:16:51 (6 years ago)
Author:
gregmac
Message:

Merged revisions 3542,3544-3546 via svnmerge from
https://svn.sourceforge.net/svnroot/amportal/freepbx/branches/2.2

........

r3542 | qldrob | 2007-01-04 17:32:40 -0500 (Thu, 04 Jan 2007) | 2 lines


3 fixes to extensions.conf spotted by vgster, only seconds after releasing 2.2.0. Going to re-release it. Shh. no-one will notice.

........

r3546 | gregmac | 2007-01-05 17:03:03 -0500 (Fri, 05 Jan 2007) | 2 lines


Fix #1642

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/trunk

    • Property svnmerge-integrated changed from /freepbx/branches/2.2:1-3536 to /freepbx/branches/2.2:1-3536,3542,3544-3546

  • freepbx/trunk/amp_conf/astetc/extensions.conf

    r3531 r3547  
    221221; to from-internal since it may be an outside line. 
    222222; 
    223 exten => docfu,1,GotoIf( $[ "foo${DB(AMPUSER/${CFUEXT}/device)}" = "foo" ], chlocal) 
     223exten => docfu,1,GotoIf( $[ "foo${DB(AMPUSER/${CFUEXT}/device)}" = "foo" ]?chlocal) 
    224224exten => docfu,n,Dial(Local/${CFUEXT}@ext-local,${RT},${DIAL_OPTIONS}) 
    225225exten => docfu,n,Return 
    …… 
    435435[macro-dialout-enum] 
    436436; Re-written to use enumlookup.agi 
    437 exten => s,1,GotoIf($["${ARG3}" = ""]PASSWD?NOPASSWD); arg3 is pattern password  
     437exten => s,1,GotoIf($["${ARG3}" != ""]?PASSWD:NOPASSWD); arg3 is pattern password  
    438438exten => s,n(PASSWD),Authenticate(${ARG3})  
    439439exten => s,n(NOPASSWD),Macro(user-callerid,SKIPTTL)  
    …… 
    476476 
    477477[macro-record-enable] 
    478 exten => s,1,GotoIf(${LEN(${BLINDTRANSFER})} > 0?2:4) 
     478exten => s,1,GotoIf($[${LEN(${BLINDTRANSFER})} > 0]?2:4) 
    479479exten => s,2,ResetCDR(w) 
    480480exten => s,3,StopMonitor()