Show
Ignore:
Timestamp:
07/03/07 17:35:55 (6 years ago)
Author:
p_lindheimer
Message:

Auto Check-in of any outstanding patches

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • modules/branches/2.3/core/etc/extensions.conf

    r4279 r4301  
    290290; If the required voicemail file does not exist, then abort and go to normal voicemail behavior 
    291291; TODO: figure out which is proper file (.wav or .WAV) and maybe find a better way 
     292;       still want to find something better than 'ls' but for now, it checks either 
    292293; 
    293294exten => vmx,n,Macro(get-vmcontext,${ARG1}) 
    294 exten => vmx,n(file),System(ls /var/spool/asterisk/voicemail/${VMCONTEXT}/${ARG1}/${MODE}.wav
     295exten => vmx,n(file),System(ls ${ASTSPOOLDIR}/voicemail/${VMCONTEXT}/${ARG1}/${MODE}.[wW][aA][vV]
    295296 
    296297; Get the repeat, timeout and loop times to use if they are overriden form the global settings 
     
    308309; then we go to the timeout. Otherwise handle invalid options by looping until the limit until a valid option is played. 
    309310; 
    310 exten => vmx,n(loopstart),Read(ACTION,/var/spool/asterisk/voicemail/${VMCONTEXT}/${ARG1}/${MODE},1,skip,${VMX_REPEAT},${VMX_TIMEOUT}) 
     311exten => vmx,n(loopstart),Read(ACTION,${ASTSPOOLDIR}/voicemail/${VMCONTEXT}/${ARG1}/${MODE},1,skip,${VMX_REPEAT},${VMX_TIMEOUT}) 
    311312exten => vmx,n,GotoIf($["${EXISTS(${ACTION})}" = "1"]?checkopt) 
    312313 
     
    591592 
    592593[macro-faxreceive] 
    593 exten => s,1,Set(FAXFILE=/var/spool/asterisk/fax/${UNIQUEID}.tif) 
     594exten => s,1,Set(FAXFILE=${ASTSPOOLDIR}/fax/${UNIQUEID}.tif) 
    594595exten => s,2,Set(EMAILADDR=${FAX_RX_EMAIL}) 
    595596exten => s,3,rxfax(${FAXFILE}) 
     
    853854exten => s,20,Set(DB(DEVICE/${CALLERID(number)}/user)=${AMPUSER}) 
    854855; create symlink from dummy device mailbox to user's mailbox 
    855 exten => s,21,System(/bin/ln -s /var/spool/asterisk/voicemail/default/${AMPUSER}/ /var/spool/asterisk/voicemail/device/${CALLERID(number)}) 
     856exten => s,21,System(/bin/ln -s ${ASTSPOOLDIR}/voicemail/default/${AMPUSER}/ ${ASTSPOOLDIR}/voicemail/device/${CALLERID(number)}) 
    856857 
    857858exten => s-FIXED,1,NoOp(Device is FIXED and cannot be logged into) 
     
    877878; remove entry from user's DEVICE key 
    878879; delete the symlink to user's voicemail box 
    879 exten => s,3,System(rm -f /var/spool/asterisk/voicemail/device/${CALLERID(number)}) 
     880exten => s,3,System(rm -f ${ASTSPOOLDIR}/voicemail/device/${CALLERID(number)}) 
    880881exten => s,4,Set(DEVAMPUSER=${DB(DEVICE/${CALLERID(number)}/user)}) 
    881882exten => s,5,Set(AMPUSERDEVICES=${DB(AMPUSER/${DEVAMPUSER}/device)})